3 files changed, 15 insertions, 3 deletions
diff --git a/cpp/src/IcePack/ApplicationDeployer.cpp b/cpp/src/IcePack/ApplicationDeployer.cpp
index 2c39e943fc3..a3aa919da83 100644
--- a/cpp/src/IcePack/ApplicationDeployer.cpp
+++ b/cpp/src/IcePack/ApplicationDeployer.cpp
@@ -46,6 +46,9 @@ public:
 	{
 	    _admin->removeServer(_name);
 	}
+	catch(const ServerNotInactiveException&)
+	{
+	}
 	catch(const ServerNotExistException&)
 	{
 	}
diff --git a/cpp/src/IcePack/Server.cpp b/cpp/src/IcePack/Server.cpp
index b746ef9ae7a..28db1b2874e 100644
--- a/cpp/src/IcePack/Server.cpp
+++ b/cpp/src/IcePack/Server.cpp
@@ -314,12 +314,11 @@ int
     adminAdapter->setLocator(locatorProxy);
     
     //
-    // Activate the adapters.
+    // Activate adapters.
     //
-    shutdownOnInterrupt();
     adminAdapter->activate();
-    locatorAdapter->activate();
     locatorRegistryAdapter->activate();
+    locatorAdapter->activate();
 
     //
     // Deploy application desciptor.
@@ -342,6 +341,13 @@ int
 	}
     }
 
+    string bundleName = properties->getProperty("IcePack.PrintServersReady");
+    if(!bundleName.empty())
+    {
+	cout << bundleName << " ready" << endl;
+    }
+
+    shutdownOnInterrupt();
     communicator()->waitForShutdown();
     ignoreInterrupt();
 
diff --git a/cpp/src/IcePack/ServerDeployer.cpp b/cpp/src/IcePack/ServerDeployer.cpp
index 60636a9a1cd..9c490405ded 100644
--- a/cpp/src/IcePack/ServerDeployer.cpp
+++ b/cpp/src/IcePack/ServerDeployer.cpp
@@ -286,6 +286,9 @@ IcePack::ServerDeployer::undeploy()
     {
 	_serverManager->remove(_description.name);
     }
+    catch(const ServerNotInactiveException&)
+    {
+    }
     catch(const ServerNotExistException&)
     {
     }