diff -bruN txAMQP-0.6.1/src/txamqp/client.py txAMQP-0.6.1.new/src/txamqp/client.py
--- txAMQP-0.6.1/src/txamqp/client.py	2012-03-08 13:54:28.000000000 +0100
+++ txAMQP-0.6.1.new/src/txamqp/client.py	2012-03-19 13:02:48.000000000 +0100
@@ -99,7 +99,7 @@
 
     def channel_close(self, ch, msg):
         ch.channel_close_ok()
-        ch.close(msg)
+        ch.doClose(msg)
 
     def connection_close(self, ch, msg):
         self.client.close(msg)
diff -bruN txAMQP-0.6.1/src/txamqp/protocol.py txAMQP-0.6.1.new/src/txamqp/protocol.py
--- txAMQP-0.6.1/src/txamqp/protocol.py	2011-03-01 18:45:13.000000000 +0100
+++ txAMQP-0.6.1.new/src/txamqp/protocol.py	2012-03-19 17:24:19.000000000 +0100
@@ -2,6 +2,7 @@
 from twisted.internet import defer, protocol
 from twisted.internet.task import LoopingCall
 from twisted.protocols import basic
+from twisted.python.failure import Failure
 from txamqp import spec
 from txamqp.codec import Codec
 from txamqp.connection import Header, Frame, Method, Body, Heartbeat
@@ -21,24 +22,35 @@
 # per connection
 class AMQChannel(object):
 
-    def __init__(self, id, outgoing):
+    def __init__(self, id, outgoing, client):
         self.id = id
         self.outgoing = outgoing
+        self.client = client
         self.incoming = TimeoutDeferredQueue()
         self.responses = TimeoutDeferredQueue()
 
         self.queue = None
 
+        self._closing = False
         self.closed = False
         self.reason = None
 
     def close(self, reason):
+        """Explicitely close a channel"""
+        self._closing = True
+        self.doClose(reason)
+        self._closing = False
+
+    def doClose(self, reason):
+        """Called when channel_close() is received"""
         if self.closed:
             return
         self.closed = True
         self.reason = reason
         self.incoming.close()
         self.responses.close()
+        if not self._closing:
+            self.client.channelFailed(self, Failure(reason))
 
     def dispatch(self, frame, work):
         payload = frame.payload
@@ -265,7 +277,7 @@
             try:
                 ch = self.channels[id]
             except KeyError:
-                ch = self.channelFactory(id, self.outgoing)
+                ch = self.channelFactory(id, self.outgoing, self)
                 self.channels[id] = ch
         finally:
             self.channelLock.release()
@@ -378,3 +390,7 @@
             if self.checkHB.active():
                 self.checkHB.cancel()
         self.close(reason)
+
+    def channelFailed(self, channel, reason):
+        """Unexpected channel close"""
+        pass