1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IceStorm/Server.cpp b/cpp/src/IceStorm/Server.cpp
index 92d4d015acb..17e1ef3d1de 100644
--- a/cpp/src/IceStorm/Server.cpp
+++ b/cpp/src/IceStorm/Server.cpp
@@ -96,9 +96,12 @@ IceStorm::Server::runFreeze(int argc, char* argv[], const Freeze::DBEnvironmentP
 									       "IceStorm.TopicManager.Endpoints");
     TopicManagerIPtr manager = new TopicManagerI(communicator(), adapter, traceLevels, dbEnv, dbTopicManager);
     adapter->add(manager, stringToIdentity("TopicManager"));
-    adapter->activate();
 
+    //
+    // Everything ok, let's go.
+    //
     shutdownOnInterrupt();
+    adapter->activate();
     communicator()->waitForShutdown();
     ignoreInterrupt();