From dbf0eced4b451a59ac0cc3ccc2155d99fbae42ce Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@apache.org>
Date: Tue, 5 Apr 2016 11:19:04 -0500
Subject: [PATCH] ARTEMIS-467 Potential NPE

---
 .../activemq/artemis/jms/server/impl/JMSServerManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index d888a8c61b..8fe181a767 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1239,7 +1239,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
       checkInitialised();
       List<String> registryBindings = connectionFactoryBindings.get(name);
 
-      if (registry != null) {
+      if (registry != null && registryBindings != null) {
          for (String registryBinding : registryBindings) {
             registry.unbind(registryBinding);
          }