diff --git a/MakoVote/scripting/MakoVote.sp b/MakoVote/scripting/MakoVote.sp
index 2ac4c8b6..64ea4a5a 100644
--- a/MakoVote/scripting/MakoVote.sp
+++ b/MakoVote/scripting/MakoVote.sp
@@ -65,13 +65,15 @@ public Action VerifyMap()
 
 public void OnEntityCreated(int iEntity, const char[] sClassname)
 {
-	if (IsValidEntity(iEntity))
-		SDKHook(iEntity, SDKHook_SpawnPost, OnEntitySpawned);
+	if (!IsValidEntity(iEntity) || g_bVoteFinished)
+		return;
+
+	SDKHook(iEntity, SDKHook_SpawnPost, OnEntitySpawned);
 }
 
 public void OnEntitySpawned(int iEntity)
 {
-	if (g_bVoteFinished)
+	if (!IsValidEntity(iEntity) || g_bVoteFinished)
 		return;
 
 	char sTargetname[128];