diff --git a/space/jsontospaceparser.cpp b/space/jsontospaceparser.cpp
index cb59e75..0799054 100644
--- a/space/jsontospaceparser.cpp
+++ b/space/jsontospaceparser.cpp
@@ -737,13 +737,11 @@ bool correct;
 	{
 		size_t len = PT::UTF8ToInt(pchar_ascii, c, correct);
 		pchar_ascii += len;
-
-		if( *pchar_ascii == 0 )
-			return lastc;
 	}
-	while( !correct );
+	while( *pchar_ascii && !correct );
 
-	lastc = c;
+	if( correct )
+		lastc = c;
 
 	if( lastc == '\n' )
 		++line;