diff --git a/unpick-format-utils/src/main/java/daomephsta/unpick/constantmappers/datadriven/parser/v2/UnpickV2Reader.java b/unpick-format-utils/src/main/java/daomephsta/unpick/constantmappers/datadriven/parser/v2/UnpickV2Reader.java
index 1b7b13d..461f138 100644
--- a/unpick-format-utils/src/main/java/daomephsta/unpick/constantmappers/datadriven/parser/v2/UnpickV2Reader.java
+++ b/unpick-format-utils/src/main/java/daomephsta/unpick/constantmappers/datadriven/parser/v2/UnpickV2Reader.java
@@ -131,7 +131,10 @@ private void visitSimpleConstantDefinition(Visitor visitor, String[] tokens, int
 		{
 			visitor.visitSimpleConstantDefinition(tokens[1], tokens[2], tokens[3], tokens[4], tokens[5]);
 		}
-		visitor.visitSimpleConstantDefinition(tokens[1], tokens[2], tokens[3], null, null);
+		else
+		{
+		    visitor.visitSimpleConstantDefinition(tokens[1], tokens[2], tokens[3], null, null);
+		}
 	}
 	
 	private void visitFlagConstantDefinition(Visitor visitor, String[] tokens, int lineNumber)
@@ -142,7 +145,10 @@ private void visitFlagConstantDefinition(Visitor visitor, String[] tokens, int l
 		{
 			visitor.visitFlagConstantDefinition(tokens[1], tokens[2], tokens[3], tokens[4], tokens[5]);
 		}
-		visitor.visitFlagConstantDefinition(tokens[1], tokens[2], tokens[3], null, null);
+		else
+		{
+		    visitor.visitFlagConstantDefinition(tokens[1], tokens[2], tokens[3], null, null);
+		}
 	}
 	
 	private void visitTargetMethodDefinition(Visitor visitor, String[] tokens, int lineNumber)