diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/utils/JsonTrackingParser.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/utils/JsonTrackingParser.java
index 5758b77472b..42a4449f3bf 100644
--- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/utils/JsonTrackingParser.java
+++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/utils/JsonTrackingParser.java
@@ -364,6 +364,7 @@ public class JsonTrackingParser {
 				break;
 			case Eof : 
 				throw lexer.error("Unexpected End of File");
+			case End:
 			default:
 				break;
 			}
@@ -407,6 +408,8 @@ public class JsonTrackingParser {
         break;
 	    case Eof : 
 	    	throw lexer.error("Unexpected End of File");
+	    case Boolean:
+		 case End:
        default:
 			break;
 	    }