diff --git a/src/com/pleaseignore/BukkitXMPP/BukkitXMPP.java b/src/com/pleaseignore/BukkitXMPP/BukkitXMPP.java
index 5f659c5..6cc4014 100644
--- a/src/com/pleaseignore/BukkitXMPP/BukkitXMPP.java
+++ b/src/com/pleaseignore/BukkitXMPP/BukkitXMPP.java
@@ -117,14 +117,12 @@ public class BukkitXMPP extends JavaPlugin implements PacketListener {
 
     private void disconnect() {
 
-        if (muc instanceof MultiUserChat) {
+        if (muc instanceof MultiUserChat && muc.isJoined()) {
             muc.leave();
-            muc = null;
         }
 
-        if (xmppconn instanceof XMPPConnection) {
+        if (xmppconn instanceof XMPPConnection && xmppconn.isConnected()) {
             xmppconn.disconnect();
-            xmppconn = null;
         }
 
     }