diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java
index b890544ad..475bc908b 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java
@@ -47,7 +47,7 @@ public final class JadxTokenMaker extends JavaTokenMaker {
 	private void processTokens(Token tokens) {
 		Token prev = null;
 		Token current = tokens;
-		while (current != null) {
+		while (current != null && current.getType() != TokenTypes.NULL) {
 			if (prev != null) {
 				switch (current.getType()) {
 					case TokenTypes.RESERVED_WORD: