diff --git a/src/StreamCore.cc b/src/StreamCore.cc
index bdd5d25..ffe9a29 100644
--- a/src/StreamCore.cc
+++ b/src/StreamCore.cc
@@ -460,7 +460,7 @@ finishProtocol(ProtocolResult status)
         status = Fault;
     }
 ////    flags &= ~(AcceptInput|AcceptEvent);
-    if (runningHandler)
+    if (runningHandler || flags & InitRun)
     {
         // get original error status
         if (status == Success) status = runningHandler;