1 files changed, 8 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index ceefcbbc6c7..a0f63926737 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -78,12 +78,15 @@ NodeSessionI::destroy(const Ice::Current& current)
 
     _database->removeNode(_name);
 
-    try
-    {
-	current.adapter->remove(current.id);
-    }
-    catch(const Ice::ObjectAdapterDeactivatedException&)
+    if(current.adapter)
     {
+	try
+	{
+	    current.adapter->remove(current.id);
+	}
+	catch(const Ice::ObjectAdapterDeactivatedException&)
+	{
+	}
     }
 }