1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Vhost.cpp b/cpp/src/qpid/broker/Vhost.cpp
index 635f345a86..537d2abf0e 100644
--- a/cpp/src/qpid/broker/Vhost.cpp
+++ b/cpp/src/qpid/broker/Vhost.cpp
@@ -27,11 +27,14 @@ Vhost::Vhost (management::Manageable* parentBroker)
 {
     if (parentBroker != 0)
     {
-        mgmtObject = management::Vhost::shared_ptr
-            (new management::Vhost (this, parentBroker, "/"));
-
         ManagementAgent::shared_ptr agent = ManagementAgent::getAgent ();
-        agent->addObject (mgmtObject);
+
+        if (agent.get () != 0)
+        {
+            mgmtObject = management::Vhost::shared_ptr
+                (new management::Vhost (this, parentBroker, "/"));
+            agent->addObject (mgmtObject);
+        }
     }
 }