1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index d50d912cff1..00ceef6b4bb 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -1095,6 +1095,11 @@ Database::getAdapterDirectProxy(const string& id, const Ice::EncodingVersion& en
 
     Ice::EndpointSeq endpoints;
     vector<AdapterInfo> infos = findByReplicaGroupId(txn, _adapters, _adaptersByGroupId, id);
+    if(infos.empty())
+    {
+        throw AdapterNotExistException(id);
+    }
+
     filterAdapterInfos("", id, _pluginFacade, con, ctx, infos);
     for(unsigned int i = 0; i < infos.size(); ++i)
     {
@@ -1108,8 +1113,7 @@ Database::getAdapterDirectProxy(const string& id, const Ice::EncodingVersion& en
     {
         return _communicator->stringToProxy("dummy:default")->ice_endpoints(endpoints);
     }
-
-    throw AdapterNotExistException(id);
+    return 0;
 }
 
 void