diff --git a/plugins/mapchooser.sp b/plugins/mapchooser.sp
index 20510b9e..8dd6d76b 100644
--- a/plugins/mapchooser.sp
+++ b/plugins/mapchooser.sp
@@ -264,7 +264,12 @@ public Event_RoundEnd(Handle:event, const String:name[], bool:dontBroadcast)
 
 public Event_PlayerDeath(Handle:event, const String:name[], bool:dontBroadcast)
 {
-	if (!GetArraySize(g_MapList) && g_Cvar_Fraglimit != INVALID_HANDLE)
+	if (!GetArraySize(g_MapList) || g_Cvar_Fraglimit == INVALID_HANDLE)
+	{
+		return;
+	}
+	
+	if (!GetConVarInt(g_Cvar_Fraglimit))
 	{
 		return;
 	}