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 e506b213e..4965a2724 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -596,7 +596,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
      */
     public synchronized void disconnect(Presence unavailablePresence) throws NotConnectedException {
         if (!isConnected()) {
-            return;
+            throw new NotConnectedException();
         }
 
         sendPacket(unavailablePresence);