Index: DOM/PM/Maatwerk/Calc/HF/impl/HFItemBuilderException.cls.xml
===================================================================
diff -u -r1075 -r1969
--- DOM/PM/Maatwerk/Calc/HF/impl/HFItemBuilderException.cls.xml	(.../HFItemBuilderException.cls.xml)	(revision 1075)
+++ DOM/PM/Maatwerk/Calc/HF/impl/HFItemBuilderException.cls.xml	(.../HFItemBuilderException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="DOM.PM.Maatwerk.Calc.HF.impl.HFItemBuilderException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="HFItemBuilder">
@@ -26,6 +26,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set ..HFItemBuilder = HFItemBuilder
 	Set ..ErrorBoodschap = ErrorBoodschap
 	Set ..ProbleemOmschrijving = ProbleemOmschrijving
@@ -47,7 +48,10 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "Halffabrikaatitembuilder die rol "_..HFItemBuilder.GeefRol()_" produceert eindigde met volgend probleem: "_..ErrorBoodschap_". Uitgebreide omschrijving: "_..ProbleemOmschrijving
+<Implementation><![CDATA[
+	Set ExceptieString = "Halffabrikaatitembuilder die rol "_..HFItemBuilder.GeefRol()_" produceert eindigde met volgend probleem: "_..ErrorBoodschap_". Uitgebreide omschrijving: "_..ProbleemOmschrijving
+	Set ExceptieString = ExceptieString_$C(13,10)_##super()
+	Quit ExceptieString
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/ExceptionHandler.cls.xml
===================================================================
diff -u -r1934 -r1969
--- TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 1934)
+++ TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 1969)
@@ -45,7 +45,6 @@
 			Else
 			{
 				ZTRAP $ZERROR
-				//Set $ECODE = "`"_%Exception.GeefExceptionCode()_"`"_%Exception.GeefOmschrijving()_"`"
 			}
 		}
 		Else
@@ -55,7 +54,6 @@
 			Set $ECODE = ""
 		}
 	}
-	
 	Quit Exception
 ]]></Implementation>
 </Method>
Index: APPS/Halux/common/impl/MaakBatchException.cls.xml
===================================================================
diff -u -r1073 -r1969
--- APPS/Halux/common/impl/MaakBatchException.cls.xml	(.../MaakBatchException.cls.xml)	(revision 1073)
+++ APPS/Halux/common/impl/MaakBatchException.cls.xml	(.../MaakBatchException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="APPS.Halux.common.impl.MaakBatchException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="BatchErrors">
@@ -16,6 +16,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	DO ##super()
 	Set ..BatchErrors = BatchErrors
 	Quit $$$OK
 ]]></Implementation>
@@ -49,6 +50,7 @@
 		}
 		Set ToString = ToString_" ] "
 	}
+	Set ToString = ToString_$C(13,10)_##super()
 	Quit ToString
 ]]></Implementation>
 </Method>
Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u -r1936 -r1969
--- TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1936)
+++ TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1969)
@@ -5,6 +5,21 @@
 <Super>TECH.IException,%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Parameter name="OverbodigeVariabelen1">
+<Type>%String</Type>
+<Default>$ZU(  5);$ZU( 12);$ZU( 18);$ZU( 20);$ZU( 23,1);$ZU( 34);$ZU( 39);$ZU( 55);$ZU( 56,0);$ZU( 56,1);$ZU( 67,10,$J);$ZU( 67,11,$J);$ZU( 67,12,$J);$ZU( 67,13,$J);$ZU( 67,14,$J);$ZU( 67,15,$J);$ZU( 67,4,$J);$ZU( 67,5,$J);$ZU( 67,7,$J);$ZU( 67,8,$J);$ZU( 67,9,$J);$ZU( 68,1);$ZU( 68,21);$ZU( 68,25);$ZU( 68,27);$ZU( 68,32);$ZU( 68,34);$ZU( 68,36);$ZU( 68,38);$ZU( 68,40);$ZU( 68,41);$ZU( 68,43);$ZU( 68,5);$ZU( 68,6);$ZU( 68,7);$ZU(131,0);$ZV;Error;Lev;Routine</Default>
+</Parameter>
+
+<Parameter name="OverbodigeVariabelen2">
+<Type>%String</Type>
+<Default>F;F0;F1;F2;F3;F4;F5;F6;F7;F8;F9;F11;F12;F55;F56;F57;F58;F60;F61;F62;F70;F71;F90;F91;F92;F93;F94;F95;FDL;FIN;FP;FG;F80;F81;F82;F83;F84;F85;F86;F87;F88;F89;F96;F97;F30;F31;F32;F33;F100;F101;F102;F103;F103;F110;F111;F120;F121;F122;F123;F124;F125;F;F0;F1;F11;F12;F2;F3;F4;F420;F5;F55;F56;F57;F58;F6;F60;F61;F62;F7;F70;F71;F8;F9;F90;F91;F92;F93;F94;F95;FCH;FCS;FDL;FE;FG;FIN;FLO;FMTB;FMTCL;FMTI;FMTK;FMTU;FMTb;FMTi;FMTk;FMTu;FR;FS;FS132;FS80;FSC;FUP</Default>
+</Parameter>
+
+<Parameter name="TekstGeenInfo">
+<Type>%String</Type>
+<Default>Geen extra info aanwezig.</Default>
+</Parameter>
+
 <Property name="InnerException">
 <Type>TECH.IException</Type>
 <Private>1</Private>
@@ -28,13 +43,12 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set ..ErrorID = $$LOG^%ETN()
-	Set ..Stack = ..StackTrace(2)
+	Set ..ErrorID = $$LOG^%ETN()
+	Set ..Stack = ..StackTrace(1)
 	Set ..Tijdstip = ##class(TECH.DateTime).CurrentTimeStamp()
 	Quit $$$OK
 ]]></Implementation>
@@ -49,18 +63,28 @@
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Tekst = "Tijdstip: "_..Tijdstip_$C(13,10)	 
-	Set Tekst = Tekst _"Stack: "_$C(13,10)_..Stack
-	  
+	Set Tekst = ""
+	Set Tekst = Tekst_"Omschrijving: "_$C(9)_..GeefOmschrijving()_$C(13,10)
+	Set Tekst = Tekst_"ErrorCode: "_$C(9)_..GeefExceptionCode()_$C(13,10)
+	Set Tekst = Tekst_"Tijdstip: "_$C(9)_..GeefTijdstip()_$C(13,10)	 
+	
 	If $IsObject(..InnerException){ 
-	 	Set Tekst = Tekst_$C(13,10)_$C(13,10)_"** InnerException **"_$C(13,10)_ ..InnerException.ToString()
-	  }
-	  
-	  Set Tekst = Tekst_$C(13,10)_..GeefErrorInformatie()
-	  Quit Tekst
+	 	Set Tekst = Tekst_$C(13,10)_$C(13,10)_"** InnerException **"_$C(13,10)_"------------------"_$C(13,10)_ ..InnerException.ToString()
+	}Else{
+		Set Tekst = Tekst_"GebruikerInitialen: "_$C(9)_##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()_$C(13,10)	 
+		Set Tekst = Tekst_"ComputerNaam:"_$C(9)_##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()_$C(13,10)_$C(13,10)	 
+		Set Tekst = Tekst _"Stack: "_$C(13,10)_"------------------"_$C(13,10)_..Stack
+	}
+	Quit Tekst
 ]]></Implementation>
 </Method>
 
+<Method name="GeefInnerException">
+<ReturnType>TECH.IException</ReturnType>
+<Implementation><![CDATA[	Quit ..InnerException
+]]></Implementation>
+</Method>
+
 <Method name="GeefStack">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Stack
@@ -87,44 +111,78 @@
 </Method>
 
 <Method name="GeefErrorInformatie">
-<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	set ErrorInfo = ""
-	if $listlength(..ErrorID) {
-		set Datum = $listget(..ErrorID,1)
-		set Error = $listget(..ErrorID,2)
-		if $length(Datum) && $length(Error) {
-			set StackLevel = ""
-			set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
-			while(StackLevel '= ""){
-				Set ErrorInfo = ErrorInfo_$C(10,13)_StackLevel
-				Set InfoType = ""
-				Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
-				While(InfoType '= ""){
-					Set ErrorInfo = ErrorInfo_$C(9)_InfoType_" : "
-					Set Key = ""
-					Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
-					If (Key = ""){
-						Set ErrorInfo = ErrorInfo_$C(9)_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
-						Set ErrorInfo = ErrorInfo_$C(10,13)
-					}Else{
-						Set ErrorInfo = ErrorInfo_$C(10,13)
-						While(Key '= ""){
-							Set ErrorInfo = ErrorInfo_$C(9)_Key
-							Set ErrorInfo = ErrorInfo_$C(9)_" = "_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
-							Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))	
-							Set ErrorInfo = ErrorInfo_$C(10,13)
+	If ($IsObject(..InnerException)){
+		set ErrorInfo = ..InnerException.GeefErrorInformatie()	
+	}
+	If ('$IsObject(..InnerException) || (ErrorInfo [ ..#TekstGeenInfo)){
+		if $listlength(..ErrorID) {
+			set Datum = $listget(..ErrorID,1)
+			set Error = $listget(..ErrorID,2)
+			set ErrorInfo = "ErrorID : "_$C(9)_Datum_","_Error_$C(13,10)
+			if ($length(Datum) && $length(Error)) {
+				set StackLevel = ""
+				set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+				while(StackLevel '= ""){
+					Set ErrorInfo = ErrorInfo_StackLevel
+					Set InfoType = ""
+					Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
+					While(InfoType '= ""){
+						If ((InfoType '= "I") && (InfoType '= "T") && (InfoType '= "S")){
+							Set InfoLabel = InfoType
+							Set:(InfoLabel = "V") InfoLabel = "Variabelen"
+							Set ErrorInfo = ErrorInfo_$C(9)_InfoLabel_" : "
+							Set Key = ""
+							Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
+							If (Key = ""){
+								Set ErrorInfo = ErrorInfo_$C(9)_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
+								Set ErrorInfo = ErrorInfo_$C(10,13)
+							}Else{
+								Set ErrorInfo = ErrorInfo_$C(10,13)
+								While(Key '= ""){
+									/// Wegfilteren overbodige info
+									If ('..CheckOverbodig(StackLevel, InfoType,Key)){							
+										Set ErrorInfo = ErrorInfo_$C(9)_$C(9)_Key
+										Set ErrorInfo = ErrorInfo_$C(9)_" = "_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
+										Set ErrorInfo = ErrorInfo_$C(10,13)
+									}
+									//If (Key = "%this") Set ErrorInfo = ErrorInfo_$$ObjToText^vhLib(Key)_$C(10,13)
+									Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))	
+								}
+								
+							}
 						}
-					}
-					Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))			
-				}		
-				Set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+						Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))			
+					}		
+					Set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+				}
 			}
+			else{
+				Set ErrorInfo = ErrorInfo_$C(10,13)_..#TekstGeenInfo
+			}
+		}else{
+			Set ErrorInfo = ErrorInfo_$C(10,13)_..#TekstGeenInfo
 		}
 	}
 	Quit ErrorInfo
 ]]></Implementation>
 </Method>
+
+<Method name="CheckOverbodig">
+<FormalSpec>StackLevel:%Integer,InfoType:%String,Key:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set Overbodig = 0
+	If (..#OverbodigeVariabelen1 [ Key )
+	{
+		Set Overbodig = 1	
+	}ElseIf (..#OverbodigeVariabelen2 [ Key )
+	{
+		Set Overbodig = 1	
+	}
+	Quit Overbodig
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: DOM/PM/Maatwerk/Calc/HF/impl/HFItemBerekenException.cls.xml
===================================================================
diff -u -r1075 -r1969
--- DOM/PM/Maatwerk/Calc/HF/impl/HFItemBerekenException.cls.xml	(.../HFItemBerekenException.cls.xml)	(revision 1075)
+++ DOM/PM/Maatwerk/Calc/HF/impl/HFItemBerekenException.cls.xml	(.../HFItemBerekenException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="DOM.PM.Maatwerk.Calc.HF.impl.HFItemBerekenException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="HFItemBuilder">
@@ -15,17 +15,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="InnerException">
-<Type>TECH.IException</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>HFItemBuilder:DOM.PM.Maatwerk.Calc.HF.IHalffabItemBuilder,SelectieKenmerken:%ArrayOfDataTypes,InnerException:TECH.IException</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set ..HFItemBuilder = HFItemBuilder
 	Set ..SelectieKenmerken = SelectieKenmerken
 	Set ..InnerException = InnerException
@@ -48,6 +44,7 @@
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	
 	Set ExceptieString = "Fout bij het berekenen van halffabitems voor rol "_..HFItemBuilder.GeefRol()_$C(10,13)
 						_"Inner exception: "_..InnerException.ToString()_$C(10,13)_
 						 "SelectieKenmerken: "
@@ -57,7 +54,7 @@
 		Set Waarde = Iterator.Next()
 		Set ExceptieString = ExceptieString_$C(10,13)_"    "_Iterator.Key()_": "_Waarde
 	}
-		
+	Set ExceptieString = ##super()	
 	Quit ExceptieString
 ]]></Implementation>
 </Method>
Index: TECH/Exceptions/AbstractOmschrijvingException.cls.xml
===================================================================
diff -u -r1931 -r1969
--- TECH/Exceptions/AbstractOmschrijvingException.cls.xml	(.../AbstractOmschrijvingException.cls.xml)	(revision 1931)
+++ TECH/Exceptions/AbstractOmschrijvingException.cls.xml	(.../AbstractOmschrijvingException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="TECH.Exceptions.AbstractOmschrijvingException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.Exceptions.Exception,%RegisteredObject</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Omschrijving">
@@ -16,7 +16,8 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Omschrijving = Omschrijving
+	Do ##super()
+	Set ..Omschrijving = Omschrijving	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: WS/Web/OLParticulier/impl/FoutieveSessieException.cls.xml
===================================================================
diff -u -r1074 -r1969
--- WS/Web/OLParticulier/impl/FoutieveSessieException.cls.xml	(.../FoutieveSessieException.cls.xml)	(revision 1074)
+++ WS/Web/OLParticulier/impl/FoutieveSessieException.cls.xml	(.../FoutieveSessieException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="WS.Web.OLParticulier.impl.FoutieveSessieException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Omschrijving">
Index: TECH/Exceptions/StatusException.cls.xml
===================================================================
diff -u -r1931 -r1969
--- TECH/Exceptions/StatusException.cls.xml	(.../StatusException.cls.xml)	(revision 1931)
+++ TECH/Exceptions/StatusException.cls.xml	(.../StatusException.cls.xml)	(revision 1969)
@@ -16,8 +16,9 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super(ExceptionCode, Omschrijving)
 	Set ..Status = Status
-	Quit ##super(ExceptionCode, Omschrijving)
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/TECH/Exceptions/KlasseB.cls.xml
===================================================================
diff -u -r1931 -r1969
--- vhUnitTest/TECH/Exceptions/KlasseB.cls.xml	(.../KlasseB.cls.xml)	(revision 1931)
+++ vhUnitTest/TECH/Exceptions/KlasseB.cls.xml	(.../KlasseB.cls.xml)	(revision 1969)
@@ -15,7 +15,6 @@
 
 <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()
Index: vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml
===================================================================
diff -u -r1934 -r1969
--- vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(.../TestExceptions.cls.xml)	(revision 1934)
+++ vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(.../TestExceptions.cls.xml)	(revision 1969)
@@ -7,55 +7,33 @@
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<UDLText name="T">
-<Content><![CDATA[
-// do ##class(vhUnitTest.TECH.Exceptions.TestExceptions).%New().TestThrowException()
-
-]]></Content>
-</UDLText>
-
-<UDLText name="T">
-<Content><![CDATA[
-// 
-
-]]></Content>
-</UDLText>
-
 <Method name="TestThrowException">
 <Implementation><![CDATA[
-		w "---------------------------------------------------------------------",!
 		Set $ZTRAP = "CatchThrow"
 		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).ThrowException()	
-		w "---------------------------------------------------------------------",!
 		Quit
 CatchThrow Set $ZTRAP = ""
 		Set Exception = ##class(TECH.ExceptionHandler).Catch()
-		w !,Exception.ToString(),!
-		w "---------------------------------------------------------------------",!
-		quit
+		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>
 
-<UDLText name="T">
-<Content><![CDATA[
-// do ##class(vhUnitTest.TECH.Exceptions.TestExceptions).%New().TestRaiseUndefined()
-
-]]></Content>
-</UDLText>
-
 <Method name="TestRaiseUndefined">
 <Implementation><![CDATA[
-		w "---------------------------------------------------------------------",!
 		Set $ZTRAP = "CatchRaise"
 		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).RaiseUndefined()	
-		
-		w "---------------------------------------------------------------------",!
 		Quit
 CatchRaise Set $ZTRAP = ""
 		Set Exception = ##class(TECH.ExceptionHandler).Catch()
-		w !,Exception.ToString(),!
-		w "---------------------------------------------------------------------",!
-		quit
+		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>
Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r1946 -r1969
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1946)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1969)
@@ -14,8 +14,6 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Label:%String,Options:%String</FormalSpec>
 <Implementation><![CDATA[
-	/// Loggen van alle variabelen per stacklevel, moet gejobbed worden of error handeling gaat niet verder.
-	//Do BACK^%ETN
 	
 	Set $ETRAP="Do ##class(TECH.Error.impl.ErrorHandler).CrashDuringErrorHandling()"
 	
@@ -49,26 +47,22 @@
 	Set Error.TrapHandler=$ETrap
 	Set:$G(%objlasterror)'="" Error.ObjectLastError=$$ParseStatus^vhLib(%objlasterror)
 	
-	Set Error.StackTrace=..StackTrace(3)
-	
 	if ( Error.ErrorCode["TECH.ExceptionHandler") && ($data(%Exception)) && ($isObject(%Exception) ) {
 		
 		If %Exception.%Extends("TECH.Exceptions.Exception") {
 			Set Error.StackTrace = %Exception.GeefStack()
 		}Else{
-			Set Error.StackTrace=..StackTrace(4)	
+			Set Error.StackTrace=..StackTrace(1)	
 		}
 		set Error.ErrorCode = $piece(Error.StackTrace," ",6)
 		Set Error.ErrorCode2="`"_%Exception.GeefExceptionCode()_"`"_%Exception.GeefOmschrijving()_"`"
 	}
 	else {
 		if Error.ErrorCode["<ECODETRAP>" { set Error.ErrorCode2=$ECODE }
-		Set Error.StackTrace=..StackTrace(3)
+		Set Error.StackTrace=..StackTrace(1)
 		Set Error.ErrorCode=$ZERROR
 	}
 	
-	//Set Error.ExtraInfo = ..GeefExtraInfo()
-	
 	Set Error.Device=$I
 	Set Error.Job=$J
 	Set Error.Server=$ZU(110)
@@ -117,6 +111,7 @@
 	
 	if $data(%Exception) && $IsObject(%Exception) {
 		Set Info = Info _ $$$CRLF_%Exception.ToString()
+		Set Info = Info _ $$$CRLF_%Exception.GeefErrorInformatie()
 	}
 	Set Logger=##class(vhLib.Logger).%New("TECH.Error")
 	Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), Info)
@@ -127,7 +122,6 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
 <Implementation><![CDATA[
-	//Quit:($$$UCase(Error.Server)="CACHE02")&&($$$UCase(Error.NameSpace)?1(1"DEV-ADMIN1"))
 	
 	set Body = ##class(%GlobalCharacterStream).%New()
 	
@@ -139,34 +133,26 @@
 
 	do Body.WriteLine()
 	do Body.WriteLine("TrapHandler: "_Error.TrapHandler)
-	do Body.WriteLine("Stack: "_Error.StackTrace)
+	do Body.WriteLine("RemoteIP: "_Error.RemoteIP)
+	do Body.WriteLine("Device: "_Error.Device_"  Job: "_Error.Job)
+	do Body.WriteLine("Server: "_Error.Server_"  NameSpace: "_Error.NameSpace)
 	do Body.WriteLine()
 
 	if $data(%Exception) && $IsObject(%Exception) {
 		do Body.WriteLine("ErrorObjectInfo :")
+		do Body.WriteLine("-----------------")
+		
 		do Body.WriteLine(%Exception.ToString())
 		do Body.WriteLine()
+		do Body.WriteLine(%Exception.GeefErrorInformatie())
+		do Body.WriteLine()
 		Set Error.ErrorCode = %Exception.GeefOmschrijving()
-	}
-
-	do Body.WriteLine("RemoteIP: "_Error.RemoteIP)
-	do Body.WriteLine()
-	do Body.WriteLine("Device: "_Error.Device_"  Job: "_Error.Job)
-	do Body.WriteLine("Server: "_Error.Server_"  NameSpace: "_Error.NameSpace)
-	do Body.WriteLine()
+	}else{
+		do Body.WriteLine()	
+		do Body.WriteLine("Stack: "_Error.StackTrace)
+		do Body.WriteLine("-----------------")
+	}	
 	
-
-	do Body.WriteLine("Variabelen : ")
-	
-	/** /
-	set Var = "%" 
-	for  { set Var = $order(@Var) quit:Var=""  
-	 	;continue:Var="%vhLastError" ;continue:Var="%ErrorObject" ;continue:Var="%this"
-		do Body.WriteLine(Var_" : "_@Var)
-		;if $IsObject(@Var) { do Body.WriteLine($$ObjToText^vhLib(@Var))	}
-	}
-	/**/
-	
 	Set From=$$$SystemMail("TECH ErrorHandler")
 	
 	
@@ -224,43 +210,5 @@
 	Quit Txt
 ]]></Implementation>
 </Method>
-
-<Method name="GeefExtraInfo">
-<Description>
-Extra info ophalen over de error, dit uit de ^ERRORS global die wordt ingesteld door de aanroep van ^%ETN</Description>
-<ClassMethod>1</ClassMethod>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set ExtraInfo = "Stack"
-	Set LaatsteErrorId = $Get(^ERRORS(+$Horolog))
-	Set StackLevel = ""
-	Set StackLevel = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel))
-	While(StackLevel '= ""){
-		Set ExtraInfo = ExtraInfo_$C(10,13)_StackLevel
-		Set InfoType = ""
-		Set InfoType = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType))
-		While(InfoType '= ""){
-			Set ExtraInfo = ExtraInfo_$C(9)_InfoType_" : "
-			Set Key = ""
-			Set Key = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType,Key))
-			If (Key = ""){
-				Set ExtraInfo = ExtraInfo_$C(9)_$Get(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType))
-				Set ExtraInfo = ExtraInfo_$C(10,13)
-			}Else{
-				Set ExtraInfo = ExtraInfo_$C(10,13)
-				While(Key '= ""){
-					Set ExtraInfo = ExtraInfo_$C(9)_Key
-					Set ExtraInfo = ExtraInfo_$C(9)_" = "_$Get(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType,Key))
-					Set Key = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType,Key))	
-					Set ExtraInfo = ExtraInfo_$C(10,13)
-				}
-			}
-			Set InfoType = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType))			
-		}		
-		Set StackLevel = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel))
-	}
-	Quit ExtraInfo
-]]></Implementation>
-</Method>
 </Class>
 </Export>
Index: DOM/PM/Maatwerk/Calc/HF/impl/Processor/ValidatieException.cls.xml
===================================================================
diff -u -r1075 -r1969
--- DOM/PM/Maatwerk/Calc/HF/impl/Processor/ValidatieException.cls.xml	(.../ValidatieException.cls.xml)	(revision 1075)
+++ DOM/PM/Maatwerk/Calc/HF/impl/Processor/ValidatieException.cls.xml	(.../ValidatieException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="DOM.PM.Maatwerk.Calc.HF.impl.Processor.ValidatieException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="ErrorBoodschap">
@@ -21,6 +21,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set ..ErrorBoodschap = ErrorBoodschap
 	Set ..HalffabList = HalffabList
 	Quit $$$OK
@@ -48,7 +49,8 @@
 	{
 		Set HalffabItem = Iterator.Next()
 		Set ExceptieString = ExceptieString_" "_HalffabItem.UnID
-	}
+	}	
+	Set ExceptieString = ExceptieString_$C(13,10)_##super()
 	Quit ExceptieString
 ]]></Implementation>
 </Method>
Index: vhUnitTest/TestCase.cls.xml
===================================================================
diff -u -r1074 -r1969
--- vhUnitTest/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1074)
+++ vhUnitTest/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1969)
@@ -46,6 +46,8 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set %VarsInMemoryBefore = 0
+	/// JBL : om vorige niet opgevangen exceptions niet te krijgen in huidige test, deze leeg maken.
+	Set %Exception = "" 
 	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryBefore=$i(%VarsInMemoryBefore)
 	
 	Quit $$$OK
Index: TECH/Algo/Stapeling/StapelingException.cls.xml
===================================================================
diff -u -r1931 -r1969
--- TECH/Algo/Stapeling/StapelingException.cls.xml	(.../StapelingException.cls.xml)	(revision 1931)
+++ TECH/Algo/Stapeling/StapelingException.cls.xml	(.../StapelingException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="TECH.Algo.Stapeling.StapelingException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.Exceptions.BaseException,%RegisteredObject</Super>
+<Super>TECH.Exceptions.BaseException</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 </Class>
 </Export>
Index: TECH/Exceptions/SaveFailedException.cls.xml
===================================================================
diff -u -r1931 -r1969
--- TECH/Exceptions/SaveFailedException.cls.xml	(.../SaveFailedException.cls.xml)	(revision 1931)
+++ TECH/Exceptions/SaveFailedException.cls.xml	(.../SaveFailedException.cls.xml)	(revision 1969)
@@ -16,8 +16,9 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super(Omschrijving)
 	Set ..Status = Status
-	Quit ##super(Omschrijving)
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/Maatwerk/Calc/HF/impl/FrameworkException.cls.xml
===================================================================
diff -u -r1075 -r1969
--- DOM/PM/Maatwerk/Calc/HF/impl/FrameworkException.cls.xml	(.../FrameworkException.cls.xml)	(revision 1075)
+++ DOM/PM/Maatwerk/Calc/HF/impl/FrameworkException.cls.xml	(.../FrameworkException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="DOM.PM.Maatwerk.Calc.HF.impl.FrameworkException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Omschrijving">
@@ -16,6 +16,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set ..Omschrijving = Omschrijving
 	Quit $$$OK
 ]]></Implementation>
@@ -35,7 +36,10 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Omschrijving
+<Implementation><![CDATA[
+	Set ExceptieString = ..Omschrijving
+	Set ExceptieString = ExceptieString_$C(13,10)_##super()
+	Quit ExceptieString
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/common/impl/ToeleveringException.cls.xml
===================================================================
diff -u -r1073 -r1969
--- APPS/Halux/common/impl/ToeleveringException.cls.xml	(.../ToeleveringException.cls.xml)	(revision 1073)
+++ APPS/Halux/common/impl/ToeleveringException.cls.xml	(.../ToeleveringException.cls.xml)	(revision 1969)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="APPS.Halux.common.impl.ToeleveringException">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.IException</Super>
+<Super>TECH.Exceptions.Exception</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="BatchError">
@@ -41,6 +41,7 @@
 	{
 		Set ToString = ToString_", "_Iterator.Next()
 	}
+	Set ToString = ToString_$C(13,10)_##super()
 	Quit ToString
 ]]></Implementation>
 </Method>