1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index 18d9808df34..3fbe3a146f1 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -687,7 +687,14 @@ LocatorI::removePendingResolve(const string& adapterId, int roundRobinCount)
         //
         if(roundRobinCount > 0)
         {
-            _database->getAdapter(adapterId)->increaseRoundRobinCount(roundRobinCount);
+            try
+            {
+                _database->getAdapter(adapterId)->increaseRoundRobinCount(roundRobinCount);
+            }
+            catch(const Ice::Exception&)
+            {
+                // Ignore.
+            }
         }
         
         map<string, deque<Ice::AMD_Locator_findAdapterByIdPtr> >::iterator p = _resolves.find(adapterId);