[#30,!37] Better exception handling.

diff --git a/src/bin/d2/main.cc b/src/bin/d2/main.cc
index c9beb40f7b6581cad45c4dd75846fd31323b0506..52b19a058ea011fd361dcfe8d77336ac1d90c1e7 100644 (file)
--- a/src/bin/d2/main.cc
+++ b/src/bin/d2/main.cc
@@ -25,14 +25,16 @@ using namespace std;
 int main(int argc, char* argv[]) {
     int ret = EXIT_SUCCESS;
 
-    // Instantiate/fetch the DHCP-DDNS application controller singleton.
-    DControllerBasePtr& controller = D2Controller::instance();
-
     // Launch the controller passing in command line arguments.
     // Exit program with the controller's return code.
     try  {
+        // Instantiate/fetch the DHCP-DDNS application controller singleton.
+        DControllerBasePtr& controller = D2Controller::instance();
+
         // 'false' value disables test mode.
         controller->launch(argc, argv, false);
+
+        boost::dynamic_pointer_cast<D2Controller>(controller)->d2ShutdownHandler();
     } catch (const VersionMessage& ex) {
         std::string msg(ex.what());
         if (!msg.empty()) {
@@ -49,7 +51,6 @@ int main(int argc, char* argv[]) {
         ret = EXIT_FAILURE;
     }
 
-    boost::dynamic_pointer_cast<D2Controller>(controller)->d2ShutdownHandler();
 
     return (ret);
 }