1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 6bdc1a1ee64..df2fdf6649f 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -109,7 +109,13 @@ ObserverTopic::unsubscribe(const Ice::ObjectPrx& observer, const string& name)
     {
         return;
     }
-    p->second->unsubscribe(observer);
+    try
+    {
+        p->second->unsubscribe(observer);
+    }
+    catch(const Ice::ObjectAdapterDeactivatedException&)
+    {
+    }
 
     assert(observer);