Index: src/server/gem.cpp
===================================================================
--- src/server/gem.cpp	(revision 5687)
+++ src/server/gem.cpp	(working copy)
@@ -2479,12 +2479,11 @@
             return true;
         lasttime = lasthit->TimeOfAttack();
 
-        gemActor* attacker = lasthit->Attacker();
-        if (!attacker)
+        if (lasthit->Attacker().IsValid())
+            lastAttacker = lasthit->Attacker();
+        else
             continue;  // ignore disconnects
 
-        lastAttacker = attacker;
-
         // If someone else, except for attacker pet, hit first and attacker not grouped with them,
         // attacker locked out
         if (lastAttacker != attacker && !attacker->IsGroupedWith(lastAttacker, true) &&