diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java
index 66385c88..5474677e 100644
--- a/src/de/steamwar/bungeecore/BungeeCore.java
+++ b/src/de/steamwar/bungeecore/BungeeCore.java
@@ -205,7 +205,8 @@ public class BungeeCore extends Plugin {
             }
         }
 
-        tablistManager.disable();
+        if(tablistManager != null)
+            tablistManager.disable();
         errorLogger.unregister();
         Statement.closeAll();
     }