diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 04ebf1b0..1d5675e9 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -487,8 +487,17 @@ public class CommandService implements INetworkDispatch  {
 		
 	}
 	
+	public CombatCommand registerCombatCommand(String name) {
+		BaseSWGCommand command = getCommandByName(name);
+		
+		if (command instanceof CombatCommand) {
+			return (CombatCommand) command;
+		}
+		
+		return null;
+	}
+	
 	public BaseSWGCommand registerCommand(String name) { return getCommandByName(name); }
-	public CombatCommand registerCombatCommand(String name) { return getCommandByName(name); }
 	public BaseSWGCommand registerGmCommand(String name) { return getCommandByName(name); }
 	public void registerAlias(String name, String target) { }