Index: Tools/Test/VerwachteExceptie.cls.xml
===================================================================
diff -u -r2355 -r2357
--- Tools/Test/VerwachteExceptie.cls.xml	(.../VerwachteExceptie.cls.xml)	(revision 2355)
+++ Tools/Test/VerwachteExceptie.cls.xml	(.../VerwachteExceptie.cls.xml)	(revision 2357)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="Tools.Test.VerwachteExceptie">
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
-<Property name="Exceptie">
+<Property name="ExceptieType">
 <Type>%String</Type>
 </Property>
 
@@ -13,21 +13,29 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Exceptie:%String="",OmschrijvingSubStrings:%ListOfDataTypes</FormalSpec>
+<FormalSpec>ExceptieType:%String="",OmschrijvingSubStrings:%ListOfDataTypes</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..Exceptie = Exceptie
+	Set ..ExceptieType = ExceptieType
 	Set ..OmschrijvingSubStrings = $Get(OmschrijvingSubStrings, ##class(%ListOfDataTypes).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Valideer">
-<FormalSpec>Exceptie:TECH.Exceptions.Exception,Message:%String</FormalSpec>
+<FormalSpec><![CDATA[Exceptie:TECH.Exceptions.Exception,&Message:%String]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..IsGeldig(Exceptie, .Message)
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldig">
+<FormalSpec><![CDATA[Exceptie:TECH.Exceptions.Exception,&Message:%String]]></FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Validator As Tools.Test.ExceptieValidator = ##class(Tools.Test.ExceptieValidator).%New(Exceptie, ##this)
 	
Index: Tools/Test/VerwachteInnerExceptie.cls.xml
===================================================================
diff -u
--- Tools/Test/VerwachteInnerExceptie.cls.xml	(revision 0)
+++ Tools/Test/VerwachteInnerExceptie.cls.xml	(revision 2357)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.VerwachteInnerExceptie">
+<Super>Tools.Test.VerwachteExceptie</Super>
+
+<Method name="Valideer">
+<FormalSpec><![CDATA[Exceptie:TECH.Exceptions.Exception,&Message:%String]]></FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Resultaat As %Boolean = $$$True
+	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Exceptie.GeefInnerExcepties())
+	
+	While (Iterator.HasNext() && Resultaat) {
+		#dim InnerExceptie As TECH.Exceptions.Exception = Iterator.Next()
+		
+		If (InnerExceptie.%ClassName($$$True) = ..ExceptieType) {
+			Set Resultaat = ..IsGeldig(InnerExceptie, .Message)			
+		} Else {
+			If (InnerExceptie.GeefInnerExcepties().Count() > 0) {
+				Set Resultaat = ..Valideer(Exceptie, .Message)	
+			}	
+		}
+	}
+	
+	Quit Resultaat
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>