1 files changed, 5 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 455983c6d8..d0dcd051f0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
@@ -94,7 +94,11 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
     {
         try
         {
-            _instanceMap.get(instanceID).close();
+            IApplicationRegistry instance = _instanceMap.get(instanceID);
+            if(instance != null)
+            {
+                instance.close();
+            }
         }
         catch (Exception e)
         {