diff --git a/src/engine/net/client/handlers/AttackCmdMsgHandler.java b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
index d5d1a0bd..617a1c24 100644
--- a/src/engine/net/client/handlers/AttackCmdMsgHandler.java
+++ b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
@@ -69,7 +69,8 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
             return true; // cannot attack a null target
         }
 
-        if (playerCharacter.isCombat() && playerCharacter.getCombatTarget().equals(target)) {
+        if (playerCharacter.isCombat() && playerCharacter.getCombatTarget() != null &&
+                playerCharacter.getCombatTarget().equals(target)) {
             Logger.info("Bypass");
             return true;
         }