diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 7a26e66f..861d4f82 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -3541,6 +3541,13 @@ void Creature::ClearIgnoreTarget()
 
 void Creature::SetLastAttacker(CreatureWeakPtr attacker)
 {
+    if (!attacker.Get()) {
+        last_attacker_.Reset();
+        last_attacker_revive_times_ = 0;
+        last_beattack_frameno_ = 0;
+        return;
+    }
     last_attacker_ = attacker;
+    last_attacker_revive_times_ = attacker.Get()->revive_count;
     last_beattack_frameno_ = room->GetFrameNo();
 }