1 files changed, 11 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
index bf8cd1e44c..2cc6591c75 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
@@ -336,8 +336,17 @@ public class FailoverMonitor extends Container<AgentProtocol>
     @Override
     protected void doDeactivate() throws Exception
     {
-      failoverMonitor.deregisterAgent(this);
-      super.doDeactivate();
+      try
+      {
+        if (failoverMonitor != null)
+        {
+          failoverMonitor.deregisterAgent(this);
+        }
+      }
+      finally
+      {
+        super.doDeactivate();
+      }
     }
 
     /**