Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r28 -r321
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 28)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 321)
@@ -10,17 +10,19 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set rset = ##class(%ResultSet).%New("TECH.PubSub.impl.EventDispatcher:qAlleSubscriptions")
-	Set sc = rset.Execute(Event)
-	While (rset.Next(.sc)){
+	Set sc = rset.Execute(Event)	
+	While (rset.Next(.sc)){		
 		If ($SYSTEM.Status.IsOK(sc)) {
 			Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(rset.Data("ID"))
 			Set $ZTRAP="DispatchError"
 			Do $ZOBJCLASSMETHOD(Subscription.RespondingClass, Subscription.RespondingMethod, Event)
+			Set $ZTRAP=""
 			Goto EindeIf
 DispatchError
 			Set $ZTRAP=""
 			Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New()
-			Do Logger.ErrorMail("Foutieve subscription","Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Error: "_$ZE)
+			Set Exception = ##class(TECH.ExceptionHandler).Catch()
+			Do Logger.ErrorMail("Foutieve subscription","Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Error: "_$C(13,10)_Exception.ToString())
 EindeIf
 		}
 		Else {