1 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 3341cccf8b2..a9e3832de70 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -109,9 +109,16 @@ IceInternal::EndpointHostResolver::run()
             _queue.pop_front();
         }
 
-        resolve.callback->connectors(
-            resolve.endpoint->connectors(
-                getAddresses(resolve.host, resolve.port, _instance->protocolSupport(), true)));
+        try
+        {
+            resolve.callback->connectors(
+                resolve.endpoint->connectors(
+                    getAddresses(resolve.host, resolve.port, _instance->protocolSupport(), true)));
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            resolve.callback->exception(ex);
+        }
     }
 
     for(deque<ResolveEntry>::const_iterator p = _queue.begin(); p != _queue.end(); ++p)