1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index 36812c69ac5..4541212d5b7 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -118,11 +118,15 @@ Ice::PluginManagerI::destroy()
 
     if(_communicator)
     {
-        map<string, PluginPtr>::iterator r;
-        for(r = _plugins.begin(); r != _plugins.end(); ++r)
+
+        if(_initialized)
         {
-            r->second->destroy();
-            r->second = 0;
+            map<string, PluginPtr>::iterator r;
+            for(r = _plugins.begin(); r != _plugins.end(); ++r)
+            {
+                r->second->destroy();
+                r->second = 0;
+            }
         }
         
         _communicator = 0;