Index: Tools/Test/TestCaseRunner.cls.xml
===================================================================
diff -u -r2355 -r2356
--- Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 2355)
+++ Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 2356)
@@ -146,14 +146,14 @@
  	set $ztrap = ""
  	set Exception = ##class(TECH.ExceptionHandler).Catch()
  	
- 	#dim ValidException As %Boolean = 0
+ 	#dim IsValidException As %Boolean = $$$False
  	#dim Message As %String = ""
 	
 	If (..TestCase.IsExceptieVerwacht()) {
-        Set ValidException = ..TestCase.GeefVerwachteExceptie().Valideer(Exception, .Message)
+        Set IsValidException = ..TestCase.GeefVerwachteExceptie().Valideer(Exception, .Message)
     }
 	
-	Do:$$$Not(ValidException) ..Manager.LogException(Exception, Message)
+	Do:$$$Not(IsValidException) ..Manager.LogException(Exception, Message)
 	goto AfterOneTest
 	quit
 
Index: Tools/Test/ExceptieValidator/GeldigeExceptieBepaler.cls.xml
===================================================================
diff -u -r715 -r2356
--- Tools/Test/ExceptieValidator/GeldigeExceptieBepaler.cls.xml	(.../GeldigeExceptieBepaler.cls.xml)	(revision 715)
+++ Tools/Test/ExceptieValidator/GeldigeExceptieBepaler.cls.xml	(.../GeldigeExceptieBepaler.cls.xml)	(revision 2356)
@@ -38,8 +38,8 @@
 <Method name="ControleerExceptie">
 <Private>1</Private>
 <Implementation><![CDATA[
-	if $$$Not(..Exceptie.%ClassName(1) = ..VerwachteExceptie.Exceptie) {
-		do ..VoegToeBezwaar(..Exceptie.%ClassName(1) _" <> "_..VerwachteExceptie.Exceptie)
+	If $$$Not(..Exceptie.%ClassName($$$True) = ..VerwachteExceptie.ExceptieType) {
+		Do ..VoegToeBezwaar(..Exceptie.%ClassName($$$True) _ " <> " _ ..VerwachteExceptie.ExceptieType)
 	}
 ]]></Implementation>
 </Method>
Index: Tools/Test/ExceptieValidator.cls.xml
===================================================================
diff -u -r719 -r2356
--- Tools/Test/ExceptieValidator.cls.xml	(.../ExceptieValidator.cls.xml)	(revision 719)
+++ Tools/Test/ExceptieValidator.cls.xml	(.../ExceptieValidator.cls.xml)	(revision 2356)
@@ -19,19 +19,22 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..Exceptie = Exceptie
-	set ..VerwachteExceptie = VerwachteExceptie
-	quit ##super()
+	Set ..Exceptie = Exceptie
+	Set ..VerwachteExceptie = VerwachteExceptie
+	
+	Quit ##super()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBezwarenBepalers">
 <Private>1</Private>
 <ReturnType>TECH.Bezwaren.BezwarenBepalerList</ReturnType>
 <Implementation><![CDATA[
-	set BezwarenBepalers = ##class(TECH.Bezwaren.BezwarenBepalerList).%New()
-	do BezwarenBepalers.Insert(##class(Tools.Test.ExceptieValidator.GeldigeExceptieBepaler).%New(..Exceptie,..VerwachteExceptie))
-	quit BezwarenBepalers
+	#dim BezwarenBepalers As TECH.Bezwaren.BezwarenBepalerList = ##class(TECH.Bezwaren.BezwarenBepalerList).%New()
+	
+	Do BezwarenBepalers.Insert(##class(Tools.Test.ExceptieValidator.GeldigeExceptieBepaler).%New(..Exceptie, ..VerwachteExceptie))
+	
+	Quit BezwarenBepalers
 ]]></Implementation>
 </Method>
 </Class>