Index: vhUnitTest/TECH/Exceptions.mac.rou
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions.mac.rou	(revision 0)
+++ vhUnitTest/TECH/Exceptions.mac.rou	(revision 1931)
@@ -0,0 +1,8 @@
+ 
+ 
+RaiseUndefined()
+	set $ztrap="^%ETN"
+	Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).RaiseUndefined()	
+	
+	Quit
+	
\ No newline at end of file
Index: TECH/Exceptions/BaseException.cls.xml
===================================================================
diff -u -r1074 -r1931
--- TECH/Exceptions/BaseException.cls.xml	(.../BaseException.cls.xml)	(revision 1074)
+++ TECH/Exceptions/BaseException.cls.xml	(.../BaseException.cls.xml)	(revision 1931)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="TECH.Exceptions.BaseException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="ExceptionCode">
@@ -23,6 +23,8 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
+	d LOG^%ETN()
 	Set ..ExceptionCode = ExceptionCode
 	Set ..Omschrijving = Omschrijving
 	Quit $$$OK
@@ -43,7 +45,11 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Omschrijving
+<Implementation><![CDATA[
+	Set Tekst = "Omschrijving: "_..Omschrijving_$C(13,10)
+	Set Tekst = Tekst_"ExceptionCode: "_..ExceptionCode
+	Set Tekst = Tekst_$C(13,10)_##super()
+	Quit Tekst
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/TECH/Exceptions/KlasseC.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/KlasseC.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/KlasseC.cls.xml	(revision 1931)
@@ -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: TECH/Algo/Stapeling/StapelingException.cls.xml
===================================================================
diff -u -r1310 -r1931
--- TECH/Algo/Stapeling/StapelingException.cls.xml	(.../StapelingException.cls.xml)	(revision 1310)
+++ TECH/Algo/Stapeling/StapelingException.cls.xml	(.../StapelingException.cls.xml)	(revision 1931)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="TECH.Algo.Stapeling.StapelingException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.Exceptions.BaseException</Super>
+<Super>TECH.Exceptions.BaseException,%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 </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 1931)
@@ -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>
Index: TECH/Exceptions/AbstractOmschrijvingException.cls.xml
===================================================================
diff -u -r1574 -r1931
--- TECH/Exceptions/AbstractOmschrijvingException.cls.xml	(.../AbstractOmschrijvingException.cls.xml)	(revision 1574)
+++ TECH/Exceptions/AbstractOmschrijvingException.cls.xml	(.../AbstractOmschrijvingException.cls.xml)	(revision 1931)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="TECH.Exceptions.AbstractOmschrijvingException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.IException,%RegisteredObject</Super>
+<Super>TECH.Exceptions.Exception,%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Omschrijving">
@@ -33,7 +33,10 @@
 <Description>
 Wordt door de error handler in het e-mailbericht bijgeschreven.</Description>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefOmschrijving()
+<Implementation><![CDATA[
+	Set Tekst = ..GeefOmschrijving()
+	Set Tekst = Tekst_$C(13,10)_##super()
+	Quit Tekst
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Exceptions/StatusException.cls.xml
===================================================================
diff -u -r1133 -r1931
--- TECH/Exceptions/StatusException.cls.xml	(.../StatusException.cls.xml)	(revision 1133)
+++ TECH/Exceptions/StatusException.cls.xml	(.../StatusException.cls.xml)	(revision 1931)
@@ -23,7 +23,7 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##super()_" ("_$$ParseStatus^vhLib(..Status)_")"
+<Implementation><![CDATA[	Quit " ("_$$ParseStatus^vhLib(..Status)_")"_$C(13,10)_##super()
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(revision 1931)
@@ -0,0 +1,34 @@
+<?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[
+		w "---------------------------------------------------------------------",!
+		Set $ZTRAP = "CatchThrow"
+		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).ThrowException()	
+		Quit
+CatchThrow Set $ZTRAP = ""
+		Set Exception = ##class(TECH.ExceptionHandler).Catch()
+		w !,Exception.ToString(),!
+]]></Implementation>
+</Method>
+
+<Method name="TestRaisedUndefined">
+<Implementation><![CDATA[
+		w "---------------------------------------------------------------------",!
+		Set $ZTRAP = "CatchRaise"
+		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).RaiseUndefined()	
+		Quit
+CatchRaise Set $ZTRAP = ""
+		Set Exception = ##class(TECH.ExceptionHandler).Catch()
+		w !,Exception.ToString(),!
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Exceptions/KlasseB.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Exceptions/KlasseB.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Exceptions/KlasseB.cls.xml	(revision 1931)
@@ -0,0 +1,47 @@
+<?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[
+	Do ##class(vhUnitTest.TECH.Exceptions.KlasseC).ThrowException()
+	   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: TECH/Exceptions/RuntimeException.cls.xml
===================================================================
diff -u -r1074 -r1931
--- TECH/Exceptions/RuntimeException.cls.xml	(.../RuntimeException.cls.xml)	(revision 1074)
+++ TECH/Exceptions/RuntimeException.cls.xml	(.../RuntimeException.cls.xml)	(revision 1931)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="TECH.Exceptions.RuntimeException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="ECode">
@@ -21,6 +21,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set ..ECode = ECode
 	Set ..ZError = ZError
 	Quit $$$OK
@@ -41,7 +42,10 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "[ ZERROR: "_..ZError_" ] [ ECODE: "_..ECode_" ]"
+<Implementation><![CDATA[
+	Set Tekst = "[ ZERROR: "_..ZError_" ] [ ECODE: "_..ECode_" ]"
+	Set Tekst = Tekst_$C(13,10)_##super()
+	Quit Tekst
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r1900 -r1931
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1900)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1931)
@@ -52,7 +52,12 @@
 	Set Error.StackTrace=..StackTrace(3)
 	
 	if ( Error.ErrorCode["TECH.ExceptionHandler") && ($data(%Exception)) && ($isObject(%Exception) ) {
-		Set Error.StackTrace=..StackTrace(4)
+		
+		If %Exception.%Extends("TECH.Exceptions.Exception") {
+			Set Error.StackTrace = %Exception.GeefStack()
+		}Else{
+			Set Error.StackTrace=..StackTrace(4)	
+		}
 		set Error.ErrorCode = $piece(Error.StackTrace," ",6)
 		Set Error.ErrorCode2="`"_%Exception.GeefExceptionCode()_"`"_%Exception.GeefOmschrijving()_"`"
 	}
@@ -137,7 +142,7 @@
 	do Body.WriteLine("Stack: "_Error.StackTrace)
 	do Body.WriteLine()
 
-	if $data(%Exception) && $IsObject(%Exception) {
+	if $data(%Exception) && $IsObject(%Exception) && '%Exception.%Extends("TECH.Exceptions.Exception") {
 		do Body.WriteLine("ErrorObjectInfo :")
 		do Body.WriteLine(%Exception.ToString())
 		do Body.WriteLine()
@@ -212,7 +217,9 @@
 <FormalSpec>From:%Integer=1</FormalSpec>
 <Implementation><![CDATA[
 	Set Txt=""
-	For i=From:1:$ESTACK Set Txt=Txt_$$$CRLF_"   "_$STACK($STACK-i)_" : "_$STACK($STACK-i,"PLACE")_" -> "_$STACK($STACK-i,"MCODE")
+	For i=From:1:$ESTACK { 
+		Set Txt=Txt_$$$CRLF_i_"   "_$STACK($STACK-i)_" : "_$STACK($STACK-i,"PLACE")_" -> "_$STACK($STACK-i,"MCODE")
+	}
 	Quit Txt
 ]]></Implementation>
 </Method>
Index: TECH/Exceptions/SaveFailedException.cls.xml
===================================================================
diff -u -r1748 -r1931
--- TECH/Exceptions/SaveFailedException.cls.xml	(.../SaveFailedException.cls.xml)	(revision 1748)
+++ TECH/Exceptions/SaveFailedException.cls.xml	(.../SaveFailedException.cls.xml)	(revision 1931)
@@ -29,7 +29,7 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##super()_" ("_$$ParseStatus^vhLib(..Status)_")"
+<Implementation><![CDATA[	Quit " ("_$$ParseStatus^vhLib(..Status)_")"_$C(13,10)_##super()
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/IException.cls.xml
===================================================================
diff -u -r1074 -r1931
--- TECH/IException.cls.xml	(.../IException.cls.xml)	(revision 1074)
+++ TECH/IException.cls.xml	(.../IException.cls.xml)	(revision 1931)
@@ -17,6 +17,16 @@
 <ReturnType>TECH.enu.ExceptionCode</ReturnType>
 </Method>
 
+<Method name="GeefStack">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefTijdstip">
+<Abstract>1</Abstract>
+<ReturnType>%TimeStamp</ReturnType>
+</Method>
+
 <Method name="ToString">
 <Description>
 Wordt door de error handler in het e-mailbericht bijgeschreven.</Description>
Index: TECH/ExceptionHandler.cls.xml
===================================================================
diff -u -r1133 -r1931
--- TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 1133)
+++ TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 1931)
@@ -10,6 +10,7 @@
 <FormalSpec>Exception:TECH.IException</FormalSpec>
 <Implementation><![CDATA[
 	Set %Exception = Exception
+	Set Omschrijving = %Exception.GeefOmschrijving()	
 	Set $ECODE = "`"_Exception.GeefExceptionCode()_"`"_Exception.GeefOmschrijving()_"`"
 ]]></Implementation>
 </Method>
@@ -23,6 +24,7 @@
 	
 	If ('$Data(%Exception)) || ('$IsObject(%Exception))
 	{
+		d WLIP^vhDBG(127,"Undefined : "_$ECODE_$ZERROR)
 		Set %Exception = ##class(TECH.Exceptions.RuntimeException).%New($ECODE,$ZERROR)
 	}
 	
Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u
--- TECH/Exceptions/Exception.cls.xml	(revision 0)
+++ TECH/Exceptions/Exception.cls.xml	(revision 1931)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Exceptions.Exception">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.IException,%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="InnerException">
+<Type>TECH.IException</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Stack">
+<Description>
+TO DO : Stack zou een %Stream moeten worden.</Description>
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Tijdstip">
+<Type>%TimeStamp</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Stack = ##class(TECH.Error.impl.ErrorHandler).StackTrace(2)
+	Set ..Tijdstip = ##class(TECH.DateTime).CurrentTimeStamp()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ZetInnerException">
+<FormalSpec>Exception:TECH.IException</FormalSpec>
+<Implementation><![CDATA[		Set ..InnerException = Exception
+]]></Implementation>
+</Method>
+
+<Method name="ToString">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	  Set Tekst = "Tijdstip: "_..Tijdstip_$C(13,10)	 
+	  Set Tekst = Tekst _"Stack: "_$C(13,10)_..Stack
+	  
+	  If $IsObject(..InnerException){ 
+	  	Set Tekst = Tekst_$C(13,10)_$C(13,10)_ ..InnerException.ToString()
+	  }
+	  
+	  Set Tekst = Tekst_$C(13,10)_##class(TECH.Error.impl.ErrorHandler).GeefExtraInfo()
+	  Quit Tekst
+]]></Implementation>
+</Method>
+
+<Method name="GeefStack">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Stack
+]]></Implementation>
+</Method>
+
+<Method name="GeefTijdstip">
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[	Quit ..Tijdstip
+]]></Implementation>
+</Method>
+</Class>
+</Export>