1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp
index e01ee313204..e3623f3e367 100644
--- a/cpp/test/IceGrid/replication/AllTests.cpp
+++ b/cpp/test/IceGrid/replication/AllTests.cpp
@@ -45,6 +45,16 @@ instantiateServer(const AdminPrx& admin, const string& templ, const map<string,
 void
 removeServer(const AdminPrx& admin, const string& id)
 {
+    try
+    {
+	admin->stopServer(id);
+    }
+    catch(Ice::UserException& ex)
+    {
+	cerr << ex << endl;
+	test(false);
+    }
+
     NodeUpdateDescriptor nodeUpdate;
     nodeUpdate.name = "localnode";
     nodeUpdate.removeServers.push_back(id);