diff --git a/java-api/src/org/servalproject/json/JsonParser.java b/java-api/src/org/servalproject/json/JsonParser.java
index e6abca93..451b3436 100644
--- a/java-api/src/org/servalproject/json/JsonParser.java
+++ b/java-api/src/org/servalproject/json/JsonParser.java
@@ -111,7 +111,7 @@ public class JsonParser {
 		if (current != ch) {
 			return false;
 		}
-		read();
+		current=0;
 		return true;
 	}
 
@@ -122,14 +122,8 @@ public class JsonParser {
 
 	private void requireConstString(String str) throws IOException, JsonParseException{
 		// Check for every character, without attempting to read past the end
-		for(int i=0;i<str.length();i++) {
-			if (current == 0)
-				read();
-			char ch = str.charAt(i);
-			if (current != ch)
-				expected("'"+ch+"'");
-			current = 0;
-		}
+		for(int i=0;i<str.length();i++)
+			requireChar(str.charAt(i));
 	}
 
 	private void skipWhiteSpace() throws IOException {
@@ -404,6 +398,8 @@ public class JsonParser {
 	public String readString() throws IOException, JsonParseException {
 		StringBuilder sb = new StringBuilder();
 		requireChar('"');
+		if (current == 0)
+			read();
 		while(current != '"'){
 			if (current == '\\'){
 				switch (read()) {
diff --git a/java-api/src/org/servalproject/servaldna/HttpJsonSerialiser.java b/java-api/src/org/servalproject/servaldna/HttpJsonSerialiser.java
index 0053e409..6dfaf411 100644
--- a/java-api/src/org/servalproject/servaldna/HttpJsonSerialiser.java
+++ b/java-api/src/org/servalproject/servaldna/HttpJsonSerialiser.java
@@ -67,6 +67,20 @@ public abstract class HttpJsonSerialiser<T, E extends Exception> extends JsonTab
         }
     }
 
+    @Override
+    public T next() throws IOException, JsonParser.JsonParseException, E {
+        if (closed)
+            return null;
+        try {
+            return super.next();
+        }catch (IOException | JsonParser.JsonParseException e){
+            // don't throw if a close was triggered from another thread
+            if (closed)
+                return null;
+            throw e;
+        }
+    }
+
     public void close() throws IOException
     {
         if (closed)