1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 97fff196b19..23d544852eb 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -37,13 +37,10 @@ class SubscriberForwarderI : public Ice::BlobjectArrayAsync
             {
                 ex.ice_throw();
             }
-            catch(const Ice::CloseConnectionException&)
-            {
-                amdCB->ice_response(true, Ice::ByteSeq()); // Bi-dir connection is closed, ignore.
-            }
             catch(const Ice::Exception& ex)
             {
-                amdCB->ice_exception(ex);
+                // Throw ObjectNotExistException, the subscriber is unreachable
+                amdCB->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__));
             }
         }