diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 8ab54593..8e9bcf44 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -280,7 +280,10 @@ public class CommandService implements INetworkDispatch  {
 								sub += 5;
 							}
 							
-							boolean isCombatCommand = (Boolean) visitor.getObject(i, 82-sub);
+							boolean isCombatCommand = false;
+							
+							if(visitor.getObject(i, 82-sub) instanceof Boolean)
+								isCombatCommand = (Boolean) visitor.getObject(i, 82-sub);
 							
 							if (hasCharacterAbility || isCombatCommand) {
 								CombatCommand command = new CombatCommand(name.toLowerCase());