1 files changed, 14 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 220811dda07..d1bc241ee17 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1276,6 +1276,20 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
         ex.id = _id;
         throw ex;
     }
+    catch(const InvalidAdapterException& ex)
+    {
+        if(_instance->traceLevels()->location >= 1)
+        {
+            Trace out(_instance->initializationData().logger, _instance->traceLevels()->locationCat);
+            out << "couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n";
+            out << ex.reason;
+        }
+
+        NotRegisteredException ex1(__FILE__, __LINE__);
+        ex1.kindOfObject = "object adapter";
+        ex1.id = _id;
+        throw ex1;
+    }
     catch(const InvalidReplicaGroupIdException&)
     {
         if(_instance->traceLevels()->location >= 1)