diff --git a/src/zr/overlays.inc b/src/zr/overlays.inc
index 726d81d..71b816c 100644
--- a/src/zr/overlays.inc
+++ b/src/zr/overlays.inc
@@ -154,6 +154,7 @@ OverlaysOnRoundStart()
     new Float:overlaysupdate = GetConVarFloat(g_hCvarsList[CVAR_OVERLAYS_UPDATE_TIME]);
     if (overlaysupdate <= 0.0)
     {
+        tOverlays = INVALID_HANDLE;
         return;
     }
 
diff --git a/src/zr/playerclasses/classcommands.inc b/src/zr/playerclasses/classcommands.inc
index 3028162..3a27fed 100644
--- a/src/zr/playerclasses/classcommands.inc
+++ b/src/zr/playerclasses/classcommands.inc
@@ -334,6 +334,8 @@ public Action:ClassModifyCommand(client, argc)
     if (attributeflag < 0)
     {
         ReplyToCommand(client, "Invalid class attribute specified.");
+        CloseHandle(classlist);
+
         return Plugin_Handled;
     }
 
@@ -370,6 +372,8 @@ public Action:ClassModifyCommand(client, argc)
         if (!listresult)
         {
             ReplyToCommand(client, "Failed to get classes in the specified team: \"%s\".", classname);
+            CloseHandle(classlist);
+
             return Plugin_Handled;
         }
 
@@ -432,6 +436,8 @@ public Action:ClassModifyCommand(client, argc)
         if (!ClassValidateIndex(classindex))
         {
             ReplyToCommand(client, "Invalid class name specified.");
+            CloseHandle(classlist);
+
             return Plugin_Handled;
         }
 
@@ -478,6 +484,8 @@ public Action:ClassModifyCommand(client, argc)
         }
     }
 
+    CloseHandle(classlist);
+
     return Plugin_Handled;
 }
 
diff --git a/src/zr/respawn.inc b/src/zr/respawn.inc
index 4176749..f32daa1 100644
--- a/src/zr/respawn.inc
+++ b/src/zr/respawn.inc
@@ -98,6 +98,7 @@ RespawnOnClientDeath(client, attacker, const String:weapon[])
     // If player was infected, then stop.
     if (StrEqual(weapon, "zombie_claws_of_death", false))
     {
+        tRespawn[client] = INVALID_HANDLE;
         return;
     }
 
@@ -105,6 +106,7 @@ RespawnOnClientDeath(client, attacker, const String:weapon[])
     new bool:respawn = GetConVarBool(g_hCvarsList[CVAR_RESPAWN]);
     if (!respawn)
     {
+        tRespawn[client] = INVALID_HANDLE;
         return;
     }