diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java
index 4fc1024e..0b788f1e 100644
--- a/src/engine/mobileAI/MobAI.java
+++ b/src/engine/mobileAI/MobAI.java
@@ -429,9 +429,9 @@ public class MobAI {
                 mob.setCombatTarget(null);
                 return;
             }
-
             if(mob.getCombatTarget().getObjectTypeMask() == MBServerStatics.MASK_PLAYER){
-                if(mob.playerAgroMap.containsKey(mob.getCombatTarget().getObjectUUID()) == false){
+                PlayerCharacter target = (PlayerCharacter)mob.combatTarget;
+                if(mob.playerAgroMap.containsKey(target.getObjectUUID()) == false){
                     mob.setCombatTarget(null);
                     return;
                 }
@@ -439,6 +439,10 @@ public class MobAI {
                     mob.setCombatTarget(null);
                     return;
                 }
+                if(target.getClientConnection() == null){
+                    mob.setCombatTarget(null);
+                    return;
+                }
             }
         }
         //if(mob.getTimestamps().containsKey("LOCATIONSYNC") == false){