1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index dfdadb06c86..e668dc3a248 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -540,7 +540,11 @@ IceInternal::LocatorInfo::getLocatorRegistry()
     // Do not make locator calls from within sync.
     //
     LocatorRegistryPrx locatorRegistry = _locator->getRegistry();
-    
+    if(!locatorRegistry)
+    {
+        return 0;
+    }
+
     {
         IceUtil::Mutex::Lock sync(*this);