1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
index 5f8432142e..2e60ff6756 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
@@ -150,17 +150,20 @@ public abstract class Signal implements Runnable
     }
     catch (Exception ex)
     {
-      if (getProtocol().isActive())
+      if (LifecycleUtil.isActive(protocol))
       {
-        OM.LOG.error(ex);
-      }
-      else
-      {
-        if (TRACER.isEnabled())
+        Object infraStructure = protocol.getInfraStructure();
+        if (infraStructure == null || LifecycleUtil.isActive(infraStructure))
         {
-          TRACER.trace("Exception while protocol is inactive", ex); //$NON-NLS-1$
+          OM.LOG.error(ex);
+          return;
         }
       }
+
+      if (TRACER.isEnabled())
+      {
+        TRACER.trace("Exception while protocol is inactive", ex); //$NON-NLS-1$
+      }
     }
     finally
     {