1 files changed, 8 insertions, 1 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index 0b188525d70..6089a56caf1 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -277,7 +277,14 @@ public final class ServantManager
         Ice.Logger logger = null;
         synchronized(this)
         {
-            assert(_instance != null); // Must not be called after destruction.
+            //
+            // If the ServantManager has already been destroyed, we're done.
+            //
+            if(_instance == null)
+            {
+                return;
+            }
+
             logger = _instance.initializationData().logger;
             _servantMapMap.clear();