Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u -r1931 -r1934
--- TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1931)
+++ TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1934)
@@ -22,35 +22,41 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ErrorID">
+<Type>%List</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 ..ErrorID = $$LOG^%ETN()
+	Set ..Stack = ..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><![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
+	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()
+	If $IsObject(..InnerException){ 
+	 	Set Tekst = Tekst_$C(13,10)_$C(13,10)_"** InnerException **"_$C(13,10)_ ..InnerException.ToString()
 	  }
 	  
-	  Set Tekst = Tekst_$C(13,10)_##class(TECH.Error.impl.ErrorHandler).GeefExtraInfo()
+	  Set Tekst = Tekst_$C(13,10)_..GeefErrorInformatie()
 	  Quit Tekst
 ]]></Implementation>
 </Method>
@@ -66,5 +72,57 @@
 <Implementation><![CDATA[	Quit ..Tijdstip
 ]]></Implementation>
 </Method>
+
+<Method name="StackTrace">
+<FormalSpec>StackLevel</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Txt=""
+	For i=StackLevel:1:$ESTACK { 
+		Set Txt=Txt_$C(13,10)_i_"   "_$STACK($STACK-i)_" : "_$STACK($STACK-i,"PLACE")_" -> "_$STACK($STACK-i,"MCODE")
+	}
+	Quit Txt
+]]></Implementation>
+</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)
+		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)
+					}
+				}
+				Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))			
+			}		
+			Set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+		}
+		Quit ErrorInfo	
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>