Index: vhUnitTest/TECH/Exceptions/KlasseB.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/KlasseB.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/KlasseB.cls.xml	(revision 32)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Exceptions.KlasseB">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="VariabeleABC">
+<Type>%String</Type>
+</Property>
+
+<Property name="VariabeleDEF">
+<Type>%String</Type>
+</Property>
+
+<Method name="ThrowException">
+<Implementation><![CDATA[
+	   Set $ZTRAP = "CatchThrow"
+	   Set ..VariabeleABC = "Waarde1"
+	   Do ##class(vhUnitTest.TECH.Exceptions.KlasseC).ThrowException()
+	   Quit
+CatchThrow Set $ZTRAP = ""
+	   Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	   Set NewException = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Klasse B detecteert exception.")
+	   Do NewException.ZetInnerException(Exception)
+	   Do ##class(TECH.ExceptionHandler).Throw(NewException)
+]]></Implementation>
+</Method>
+
+<Method name="RaiseUndefined">
+<Implementation><![CDATA[
+		Set $ZTRAP = "CatchRaise"
+		Set ..VariabeleDEF = "Waarde2"
+		Set Var = "NieuweWaarde"
+	   Do ##class(vhUnitTest.TECH.Exceptions.KlasseC).RaiseUndefined()
+	   Quit 
+CatchRaise 
+	   Set $ZTRAP = ""
+	   Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	   Set NewException = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Klasse B detecteert undefined.")
+	   Do NewException.ZetInnerException(Exception)
+	   Do ##class(TECH.ExceptionHandler).Throw(NewException)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(revision 32)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Exceptions.TestExceptions">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","TECH.Exceptions.TestExceptions")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestThrowException">
+<Implementation><![CDATA[
+		Set $ZTRAP = "CatchThrow"
+		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).ThrowException()	
+		Quit
+CatchThrow Set $ZTRAP = ""
+		Set Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertEquals(Exception.GeefOmschrijving(),"Klasse B detecteert exception.","Omschrijving van Exception is correct.")
+		Do $$$AssertTrue($IsObject(Exception.GeefInnerException()),"InnerException is een object.")
+		Do $$$AssertEquals(Exception.GeefInnerException().GeefOmschrijving()," [Exception, gethrowed in Klasse C.]","Omschrijving van Exception is correct.")
+		Do $$$AssertFalse('$IsObject(Exception.GeefInnerException()),"InnerException van InnerException bestaat niet.")		
+		Quit
+]]></Implementation>
+</Method>
+
+<Method name="TestRaiseUndefined">
+<Implementation><![CDATA[
+		Set $ZTRAP = "CatchRaise"
+		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).RaiseUndefined()	
+		Quit
+CatchRaise Set $ZTRAP = ""
+		Set Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertEquals(Exception.GeefOmschrijving(),"Klasse B detecteert undefined.","Omschrijving van Exception is correct.")
+		Do $$$AssertTrue($IsObject(Exception.GeefInnerException()),"InnerException is een object.")
+		Do $$$AssertEquals(Exception.GeefInnerException().GeefOmschrijving(),"Runtime exception","Omschrijving van Exception is correct.")
+		Do $$$AssertFalse('$IsObject(Exception.GeefInnerException()),"InnerException van InnerException bestaat niet.")
+		Quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Exceptions/KlasseC.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/KlasseC.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/KlasseC.cls.xml	(revision 32)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Exceptions.KlasseC">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="ThrowException">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError()," [Exception, gethrowed in Klasse C.]"))
+]]></Implementation>
+</Method>
+
+<Method name="RaiseUndefined">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Set a = b
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Exceptions/KlasseA.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/KlasseA.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/KlasseA.cls.xml	(revision 32)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Exceptions.KlasseA">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="ThrowException">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[		Do ##class(vhUnitTest.TECH.Exceptions.KlasseB).%New().ThrowException()
+]]></Implementation>
+</Method>
+
+<Method name="RaiseUndefined">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	
+		Do ##class(vhUnitTest.TECH.Exceptions.KlasseB).%New().RaiseUndefined()
+]]></Implementation>
+</Method>
+</Class>
+</Export>