diff --git a/mapchooser_extended/scripting/mapchooser_extended.sp b/mapchooser_extended/scripting/mapchooser_extended.sp
index 7a9f48a8..1e3070b3 100755
--- a/mapchooser_extended/scripting/mapchooser_extended.sp
+++ b/mapchooser_extended/scripting/mapchooser_extended.sp
@@ -1878,6 +1878,15 @@ NominateResult InternalNominateMap(char[] map, int owner)
         }
     }
     
+    if (g_NominateList[owner] == INVALID_HANDLE)
+    {
+        if (IsClientConnected(owner) && IsClientInGame(owner))
+        {
+            ReplyToCommand(owner, "This should be invalid.");
+        }
+        return Nominate_InvalidMap;
+    }
+
     PushArrayString(g_NominateList[owner], map);
     PushArrayCell(g_NominateOwners, owner); //maybe i only want to do this for the first nomination of each client
     if(owner == 0 && g_NominateReservedCount < GetVoteSize(1))
diff --git a/mapchooser_extended/scripting/nominations_extended.sp b/mapchooser_extended/scripting/nominations_extended.sp
index 2fb74f63..fdbb134f 100755
--- a/mapchooser_extended/scripting/nominations_extended.sp
+++ b/mapchooser_extended/scripting/nominations_extended.sp
@@ -174,7 +174,7 @@ public void sql_select_hiding_unavailable_maps(int client)
 
 public void SQL_OnQueryCompleted_ignoring(Database db, DBResultSet results, const char[] error, int Serial)
 {
-    if (!db)
+    if (!db || results == INVALID_HANDLE)
     {
         delete results;
         return;
@@ -189,7 +189,9 @@ public void SQL_OnQueryCompleted_ignoring(Database db, DBResultSet results, cons
     {
         int val = 0;
         if (results.RowCount && results.FetchRow())
+        {
             val = results.FetchInt(0);
+        }
         if (val == 1)
         {
             g_bClientsIgnoring[client] = true;