1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index 5799a1adca..b2a039d1fa 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -111,6 +111,8 @@ ManagementAgent::RemoteAgent::~RemoteAgent ()
     if (mgmtObject != 0) {
         mgmtObject->resourceDestroy();
         agent.deleteObjectNowLH(mgmtObject->getObjectId());
+        delete mgmtObject;
+        mgmtObject = 0;
     }
 }
 
@@ -146,6 +148,8 @@ ManagementAgent::~ManagementAgent ()
         v2Topic.reset();
         v2Direct.reset();
 
+        remoteAgents.clear();
+
         moveNewObjectsLH();
         for (ManagementObjectMap::iterator iter = managementObjects.begin ();
              iter != managementObjects.end ();