Index: TECH/Persistentie/GlobalUtils.cls.xml
===================================================================
diff -u -r130 -r250
--- TECH/Persistentie/GlobalUtils.cls.xml	(.../GlobalUtils.cls.xml)	(revision 130)
+++ TECH/Persistentie/GlobalUtils.cls.xml	(.../GlobalUtils.cls.xml)	(revision 250)
@@ -17,12 +17,12 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
-	Set NodeKeyIsGeldig = 1
-	Set NodeKey = GlobalNaam _ "("
+	#dim NodeKeyIsGeldig As %Boolean = 1
+	#dim NodeKey As %String = GlobalNaam _ "("
 	
 	Set SubscriptsIterator = ##class(TECH.ListIterator).%New(Subscripts)
 	While (SubscriptsIterator.HasNext()) {
-		Set SubscriptWaarde = SubscriptsIterator.Next()
+		#dim SubscriptWaarde As %String = SubscriptsIterator.Next()
 		If (' ..IsGeldigeSubscript(SubscriptWaarde)) {
 			Set NodeKeyIsGeldig = 0
 		}
@@ -32,14 +32,14 @@
 			Set NodeKey = NodeKey _ ","
 		}
 	}
-	
 	Set NodeKey = NodeKey _ ")"
 	
-	If (NodeKeyIsGeldig) {
-		Quit NodeKey 
-	} Else {
-		Set $ECODE="NodeKeyIsOngeldig:[" _ NodeKey _ "]"
+	If '(NodeKeyIsGeldig) {
+		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("NodeKeyIsOngeldig:[" _ NodeKey _ "]")
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
+		
+	Quit NodeKey
 ]]></Implementation>
 </Method>