1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index 6486e8bb26e..9816b7eaa48 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -244,14 +244,11 @@ NodeSessionI::loadServers_async(const AMD_NodeSession_loadServersPtr& amdCB, con
     //
     // Get the server proxies to load them on the node.
     //
-    try
-    {
-        ServerEntrySeq servers = _database->getNode(_info->name)->getServers();
-        for_each(servers.begin(), servers.end(), IceUtil::voidMemFun(&ServerEntry::syncAndWait));
-    }
-    catch(const DeploymentException&)
+    ServerEntrySeq servers = _database->getNode(_info->name)->getServers();
+    for(ServerEntrySeq::const_iterator p = servers.begin(); p != servers.end(); ++p)
     {
-        // Ignore.
+        (*p)->sync();
+        (*p)->waitForSyncNoThrow(1); // Don't wait too long.
     }
 }