diff --git a/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java b/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
index be24390477..53dca98056 100644
--- a/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
+++ b/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
@@ -378,7 +378,9 @@ public String basicConsume(String queue, boolean autoAck, String consumerTag, bo
 
     public void basicCancel(String consumerTag) throws IOException {
         RecordedConsumer c = this.deleteRecordedConsumer(consumerTag);
-        this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());
+        if(c != null) {
+            this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());
+        }
         delegate.basicCancel(consumerTag);
     }