diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
index d4ec43c..1fe3590 100644
--- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
+++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
@@ -243,7 +243,7 @@ private void unload()
 			inventoryClearCommand = null;
 		}
 		if(collector != null) collector.close();
-		commandManager.close();
+		if(commandManager != null) commandManager.close();
 		if(collector != null) collector.cancel();
 		if(database != null) database.close(); // Close the DB connection, we won't need them any longer
 		HandlerList.unregisterAll(this); // Stop the listeners