diff --git a/src/zr/event.inc b/src/zr/event.inc
index 1f92e1c..cee46e6 100644
--- a/src/zr/event.inc
+++ b/src/zr/event.inc
@@ -245,7 +245,7 @@ public Action:EventPlayerDeath(Handle:event, const String:name[], bool:dontBroad
     // Forward event to modules.
     ClassOnClientDeath(index);
     RoundEndOnClientDeath();
-    InfectOnClientDeath();
+    InfectOnClientDeath(index, attacker);
     SEffectsOnClientDeath(index);
     SpawnProtectOnClientDeath(index);
     RespawnOnClientDeath(index, attacker, weapon);
diff --git a/src/zr/infect.inc b/src/zr/infect.inc
index 0d976c6..073cfc4 100644
--- a/src/zr/infect.inc
+++ b/src/zr/infect.inc
@@ -234,7 +234,7 @@ InfectOnClientSpawn(client)
 InfectOnClientDeath(client, attacker)
 {
     // If attacker isn't valid, then stop.
-    if (!ZRIsValidClient(attacker))
+    if (!ZRIsClientValid(attacker))
     {
         return;
     }
@@ -252,7 +252,7 @@ InfectOnClientDeath(client, attacker)
     }
     
     // Add kill bonus to attacker's score.
-    new bonus = ClassGetKillBonus(index);
+    new bonus = ClassGetKillBonus(client);
     new score = ToolsClientScore(attacker, true, false);
     ToolsClientScore(attacker, true, true, score + bonus);
 }