diff --git a/src/main/java/buttondevteam/chat/commands/CommandCaller.java b/src/main/java/buttondevteam/chat/commands/CommandCaller.java
index 293247a..ee35690 100644
--- a/src/main/java/buttondevteam/chat/commands/CommandCaller.java
+++ b/src/main/java/buttondevteam/chat/commands/CommandCaller.java
@@ -35,6 +35,12 @@ public class CommandCaller implements CommandExecutor {
 			if (c.GetCommandPath() == null) {
 				TBMCCoreAPI.SendException("An error occured while registering commands",
 						new Exception("Command " + entry.getKey() + " has no command path!"));
+				continue;
+			}
+			if (c.getPlugin() == null) {
+				TBMCCoreAPI.SendException("An error occured while registering commands",
+						new Exception("Command " + entry.getKey() + " has no plugin!"));
+				continue;
 			}
 			if (!c.GetCommandPath().contains(" ")) // Top-level command
 			{