diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
index 6854b8fc6..9aa5fc156 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -654,8 +654,14 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         PacketFilter packetFilter = new IQReplyFilter(packet, this);
         // Create the packet collector before sending the packet
         PacketCollector packetCollector = createPacketCollector(packetFilter);
-        // Now we can send the packet as the collector has been created
-        sendPacket(packet);
+        try {
+            // Now we can send the packet as the collector has been created
+            sendPacket(packet);
+        }
+        catch (NotConnectedException e) {
+            packetCollector.cancel();
+            throw e;
+        }
         return packetCollector;
     }