1 files changed, 2 insertions, 11 deletions
diff --git a/cpp/test/IceGrid/session/Client.cpp b/cpp/test/IceGrid/session/Client.cpp
index 640aab0ddf1..041beb6a51f 100644
--- a/cpp/test/IceGrid/session/Client.cpp
+++ b/cpp/test/IceGrid/session/Client.cpp
@@ -27,8 +27,7 @@ main(int argc, char* argv[])
     Ice::CommunicatorPtr communicator;
     try
     {
-        Ice::InitializationData initData;
-        initData.properties = Ice::createProperties(argc, argv);
+        Ice::InitializationData initData = getTestInitData(argc, argv);
         initData.properties->setProperty("Ice.Warn.Connections", "0");
         communicator = Ice::initialize(argc, argv, initData);
         communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
@@ -42,15 +41,7 @@ main(int argc, char* argv[])
 
     if(communicator)
     {
-        try
-        {
-            communicator->destroy();
-        }
-        catch(const Ice::Exception& ex)
-        {
-            cerr << ex << endl;
-            status = EXIT_FAILURE;
-        }
+        communicator->destroy();
     }
 
     return status;