Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r2797 -r2832
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 2797)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 2832)
@@ -103,17 +103,25 @@
 		#dim EventDataClassname As %String = $classname(Event.Data)
 		#dim SerializedObject As %String = ..GeefGeserializeerdeString(Event)
 		#dim SerializedData As %String = $System.Encryption.Base64Encode(SerializedObject)
-		#dim MaakEventCode As %String = ""
-		Set MaakEventCode = "Set DataString = $System.Encryption.Base64Decode("""_SerializedData_""")"
-		Set MaakEventCode = "Set EventData = ##class(TECH.XMLCorrelater).%New().FromString(DataString,"""_EventDataClassname_""","""_EventDataClassname_""")"
-		Set MaakEventCode = MaakEventCode _$$$CRLF_ "Set Event = ##class("_Event.%ClassName(1)_").%New(EventData)"
-		Set MaakEventCode = MaakEventCode _$$$CRLF_ "Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)"
-		
+
 		set LogStream = ##class(%GlobalCharacterStream).%New()
-		do LogStream.Write("Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Data:"_$$LCVT^vhLib(SerializedObject))		
-		do LogStream.Write($$$CRLF_$$$CRLF_"Reinvoke:"_$$$CRLF_MaakEventCode)
-		do LogStream.Write(LogDetail_$$$CRLF_$$$CRLF_"Error: "_$$$CRLF_Exception.ToString())
-		do LogStream.Write(LogDetail_$$$CRLF_$$$CRLF_"Stack: "_$E(Exception.GeefStack(),1,25000))
+		do LogStream.WriteLine("Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Data:"_$$LCVT^vhLib(SerializedObject))		
+		do LogStream.WriteLine("")
+		do LogStream.WriteLine("Reinvoke:")
+		do LogStream.WriteLine("Set DataString = $System.Encryption.Base64Decode("""_SerializedData_""")")
+		do LogStream.WriteLine("Set EventData = ##class(TECH.XMLCorrelater).%New().FromString(DataString,"""_EventDataClassname_""","""_EventDataClassname_""")")
+		do LogStream.WriteLine("Set Event = ##class("_Event.%ClassName(1)_").%New(EventData)")
+		do LogStream.WriteLine("Do $ZOBJCLASSMETHOD("""_Subscription.RespondingClass_""", """_Subscription.RespondingMethod_""", Event)")
+		
+		do LogStream.WriteLine("")
+		do LogStream.WriteLine("Error: ")
+		do LogStream.WriteLine(Exception.ToString())
+		
+		do LogStream.WriteLine("")
+		do LogStream.WriteLine("Stack: ")
+		
+		do LogStream.WriteLine($E(Exception.GeefStack(),1,25000))
+		
 		do LogStream.Rewind()
 
 		set LogDetail = LogStream.Read(25000)