1 files changed, 7 insertions, 6 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
index c06305ee4e..caec2c1324 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
@@ -57,20 +57,21 @@ public class ConnectionRegistry implements IConnectionRegistry, Closeable
         {
             connection.close(cause, message);
         }
-        catch (AMQException e)
+        catch (Exception e)
         {
-            _logger.warn("Error closing connection:" + e.getMessage());
+            _logger.warn("Error closing connection: " + e.getMessage());
+            deregisterConnection(connection);
         }
     }
 
-    public void registerConnection(AMQConnectionModel connnection)
+    public void registerConnection(AMQConnectionModel connection)
     {
-        _registry.add(connnection);
+        _registry.add(connection);
     }
 
-    public void deregisterConnection(AMQConnectionModel connnection)
+    public void deregisterConnection(AMQConnectionModel connection)
     {
-        _registry.remove(connnection);
+        _registry.remove(connection);
     }
 
     @Override