Index: TECH/PubSub/OrchestrationContext.cls.xml
===================================================================
diff -u -r1074 -r4179
--- TECH/PubSub/OrchestrationContext.cls.xml	(.../OrchestrationContext.cls.xml)	(revision 1074)
+++ TECH/PubSub/OrchestrationContext.cls.xml	(.../OrchestrationContext.cls.xml)	(revision 4179)
@@ -8,7 +8,7 @@
 <Method name="GetEventRaiser">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.PubSub.EventRaiser</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.SimpelEventRaiser).%New()
+<Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.WachtendEventAanmaken).%New()
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/PubSub/impl/WachtendEventAanmaken.cls.xml
===================================================================
diff -u
--- TECH/PubSub/impl/WachtendEventAanmaken.cls.xml	(revision 0)
+++ TECH/PubSub/impl/WachtendEventAanmaken.cls.xml	(revision 4179)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.PubSub.impl.WachtendEventAanmaken">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.PubSub.EventRaiser</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="RaiseEventAsync">
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set WachtendEvent = ##class(TECH.PubSub.WachtendEvent).%New(Event)
+	Set Status = WachtendEvent.%Save()
+	If ($$$ISERR(Status))
+	{
+		Do Logger.ErrorMail("Onbewaarbare subscription","Event: "_Event.Type_", Class: "_Subscription.RespondingClass_", Method: "_Subscription.RespondingMethod_", Status: "_$$ParseStatus^vhLib(Status))
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>