Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r946 -r995
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 946)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 995)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-22 15:43:28">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-28 15:36:34">
 <Class name="TECH.Error.impl.ErrorHandler">
 <Description>
 Deze class doet de eigenlijke error afhandeling. 
@@ -8,7 +8,7 @@
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62172,56692.637432</TimeChanged>
+<TimeChanged>62178,56193.223779</TimeChanged>
 <TimeCreated>62025,48050.831801</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -43,12 +43,23 @@
 	Set Error=##class(TECH.Error.dto.ErrorInfo).%New()
 	Set Error.Label=$G(Label)
 	Set Error.ErrorCode=$ZERROR
-	Set:Error.ErrorCode["<ECODETRAP>" Error.ErrorCode2=$ECODE
-	;Set $ECODE = "" // $ECODE op leeg zetten anders gaat hij verder den boom in :)
 	
 	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) ) {
+		Set Error.StackTrace=..StackTrace(5)
+		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.ErrorCode=$ZERROR
+	}
+	
 	Set Error.Device=$I
 	Set Error.Job=$J
 	Set Error.Server=$ZU(110)
@@ -95,17 +106,10 @@
 <Implementation><![CDATA[
 	Do Error.XMLExportToString(.Info,,"literal,indent")
 	
-	if $data(%vhLastError) {
-		set LastErrorInfo = ##class(%GlobalCharacterStream).%New()
-		do LastErrorInfo.WriteLine(%vhLastError.%ClassName(1))
-		do %vhLastError.XMLExportToStream(.LastErrorInfo,,"literal,indent")
-		
+	if $data(%Exception) && $IsObject(%Exception) {
+		Set Info = Info _ $$$CRLF_%Exception.ToString()
 	}
 	Set Logger=##class(vhLib.Logger).%New("TECH.Error")
-	
-	if $data(LastErrorInfo) {
-		Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), LastErrorInfo)
-	}
 	Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), Info)
 ]]></Implementation>
 </Method>
@@ -128,11 +132,20 @@
 	do Body.WriteLine("TrapHandler: "_Error.TrapHandler)
 	do Body.WriteLine("Stack: "_Error.StackTrace)
 	do Body.WriteLine()
+
+	if $data(%Exception) && $IsObject(%Exception) {
+		do Body.WriteLine("ErrorObjectInfo :")
+		do Body.WriteLine(%Exception.ToString())
+		do Body.WriteLine()
+	}
+
 	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()
+	
+
 	do Body.WriteLine("Variabelen : ")
 	
 	/** /
@@ -201,5 +214,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1475657538"/>
+<Checksum value="1155315988"/>
 </Export>