Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r1083 -r1085
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1083)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1085)
@@ -3,7 +3,7 @@
 <Class name="TECH.PubSub.impl.EventDispatcher">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Method name="DispatchEventASync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
@@ -24,14 +24,8 @@
 		{
 			Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New()
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-			#dim SerializedObject As %String = ..GeefGeserializeerdeString(Event)
-			#dim SerializedData As %String = $System.Encryption.Base64Encode(SerializedObject)
-			#dim MaakEventCode As %String = "Set EventData = ##class(%SerialObject).%Open($System.Encryption.Base64Decode("""_SerializedData_"""))"
-			Set MaakEventCode = MaakEventCode _$C(13,10)_ "Set Event = ##class("_Event.%ClassName(1)_").%New(EventData)"
-			Set MaakEventCode = MaakEventCode _$C(13,10)_ "Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)"
-
-			#dim LogDetail As %String = "Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Data:"_$$LCVT^vhLib(SerializedObject)_$C(13,10,13,10)_"Reinvoke:"_$C(13,10)_MaakEventCode_$C(13,10,13,10)_"Error: "_$C(13,10)_Exception.ToString()
-			Set LogDetail=LogDetail_"Stack: "_$C(13,10)_$E(Exception.GeefStack(),1,25000)
+			
+			#dim LogDetail As %String = ..GeefLogDetail(Event,Exception,Subscription)
 			Do Logger.ErrorMail(Exception.GeefOmschrijving(), LogDetail)
 						
 			if ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("TECH.PubSub.Rethrow_Exception") {
@@ -72,6 +66,33 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLogDetail">
+<FormalSpec>Event:TECH.PubSub.Event,Exception:TECH.Exceptions.Exception,Subscription:TECH.PubSub.EventSubscription</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#dim LogDetail As %String = ""
+
+	Try {
+		#dim SerializedObject As %String = ..GeefGeserializeerdeString(Event)
+		#dim SerializedData As %String = $System.Encryption.Base64Encode(SerializedObject)
+		#dim MaakEventCode As %String = "Set EventData = ##class(%SerialObject).%Open($System.Encryption.Base64Decode("""_SerializedData_"""))"
+		Set MaakEventCode = MaakEventCode _$C(13,10)_ "Set Event = ##class("_Event.%ClassName(1)_").%New(EventData)"
+		Set MaakEventCode = MaakEventCode _$C(13,10)_ "Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)"
+
+		Set LogDetail = "Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Data:"_$$LCVT^vhLib(SerializedObject)
+		Set LogDetail=LogDetail_$C(13,10,13,10)_"Reinvoke:"_$C(13,10)_MaakEventCode
+		Set LogDetail=LogDetail_$C(13,10,13,10)_"Error: "_$C(13,10)_Exception.ToString()
+		Set LogDetail=LogDetail_$C(13,10,13,10)_"Stack: "_$E(Exception.GeefStack(),1,25000)
+	}
+	Catch {
+		#dim LogDetailException As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set LogDetail="Fout in GeefLogDetail :"_LogDetailException.GeefOmschrijving()_$$$CRLF_LogDetailException.GeefStack()
+	}
+	Quit LogDetail
+]]></Implementation>
+</Method>
+
 <Method name="GeefGeserializeerdeString">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <Private>1</Private>