1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index ff26f903d69..1ca0236d195 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -225,6 +225,12 @@ LocatorI::Request::exception()
 void
 LocatorI::Request::response(const Ice::ObjectPrx& proxy)
 {
+    if(!proxy)
+    {
+	exception();
+	return;
+    }
+
     Lock sync(*this);
     _proxies.push_back(proxy->ice_newIdentity(Ice::stringToIdentity("dummy")));