diff --git a/src/zutil/parser/json/JSONParser.java b/src/zutil/parser/json/JSONParser.java
index bc3195f..9e51780 100755
--- a/src/zutil/parser/json/JSONParser.java
+++ b/src/zutil/parser/json/JSONParser.java
@@ -110,8 +110,10 @@ public class JSONParser extends Parser {
                 root = new DataNode(DataType.Map);
                 while(end.i == CONTINUE) {
                     key = parse(in, end);
+                    if(end.i == END_WITH_NULL) // Break if there is no more data
+                        break;
                     node = parse(in, end);
-                    if(end.i != END_WITH_NULL)
+                    if(end.i != END_WITH_NULL) // Only add the entry if it is a value
                         root.set( key.toString(), node );
                 }
                 end.i = CONTINUE;