diff --git a/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index ef5253154..158d6785d 100644
--- a/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -102,10 +102,16 @@ public class InBandBytestreamManager implements BytestreamManager {
                 // register shutdown listener
                 connection.addConnectionListener(new AbstractConnectionListener() {
 
+                    @Override
                     public void connectionClosed() {
                         manager.disableService();
                     }
 
+                    @Override
+                    public void connectionClosedOnError(Exception e) {
+                        manager.disableService();
+                    }
+
                 });
 
             }
diff --git a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 286041519..e477222b9 100644
--- a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -96,10 +96,16 @@ public final class Socks5BytestreamManager implements BytestreamManager {
                 // register shutdown listener
                 connection.addConnectionListener(new AbstractConnectionListener() {
 
+                    @Override
                     public void connectionClosed() {
                         manager.disableService();
                     }
 
+                    @Override
+                    public void connectionClosedOnError(Exception e) {
+                        manager.disableService();
+                    }
+
                 });
             }