Index: TECH/JSON/Parser.cls.xml
===================================================================
diff -u -r897 -r3783
--- TECH/JSON/Parser.cls.xml	(.../Parser.cls.xml)	(revision 897)
+++ TECH/JSON/Parser.cls.xml	(.../Parser.cls.xml)	(revision 3783)
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="TECH.JSON.Parser">
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Method name="ParseJSON">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>pJSON:%String,pClass:%String="",*pObject:%RegisteredObject,*pCharsProcessed:%Integer,pLevel:%Integer=1,pFirstChar:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	#dim Status As %Status = ##class(TECH.JSON.ParserIntersystemsVersion).ParseJSON(pJSON,pClass,.pObject,.pCharsProcessed,pLevel,pFirstChar)
-	if $$$ISERR(Status) {
-		set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Parsing JSON file failed : "_$$ParseStatus^vhLib(Status))
-		do Exception.VoegToeExtraInfo($get(pJSON))
-		do ##class(TECH.ExceptionHandler).Throw(Exception)	
+	If $$$ISERR(Status) {
+		Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Parsen van het JSON bericht is gefaald : "_$$ParseStatus^vhLib(Status))
+		Do Exception.VoegToeExtraInfo(pJSON)
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)	
 	}
 	
-	if '$IsObject(pObject) {
-		set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Parsing JSON file failed - object mapping not correct")
-		do Exception.VoegToeExtraInfo("JSONString : "_$get(pJSON))
-		do Exception.VoegToeExtraInfo("ClassName  : "_pClass)
-		do ##class(TECH.ExceptionHandler).Throw(Exception)	
+	If $$$Not($IsObject(pObject)) {
+		Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Geen returnobject gemaakt, controleer het JSON formaat van de stream en/of object mapping.")
+		Do pJSON.Rewind()
+		Do Exception.VoegToeExtraInfo("ClassName  : "_pClass)
+		Do Exception.VoegToeExtraInfo("JSONString : ")
+		Do Exception.VoegToeExtraInfo(pJSON)
+		
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)	
 	}
 ]]></Implementation>
 </Method>