diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 596329e9499b7..ac8e0298a449d 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1909,9 +1909,6 @@ bool AchievementMgr::RequirementsSatisfied(AchievementCriteriaEntry const* achie
                 if (!area)
                     break;
 
-                if (area->exploreFlag < 0)
-                    continue;
-
                 uint32 playerIndexOffset = uint32(area->exploreFlag) / 32;
                 if (playerIndexOffset >= PLAYER_EXPLORED_ZONES_SIZE)
                     continue;
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 162c39b951ba2..24c9100b22285 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -226,7 +226,7 @@ namespace Trinity
 
     inline bool IsValidMapCoord(float x, float y, float z)
     {
-        return IsValidMapCoord(x, y) && std::isfinite(z);
+        return IsValidMapCoord(x, y) && IsValidMapCoord(z);
     }
 
     inline bool IsValidMapCoord(float x, float y, float z, float o)
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 8ebbba784df35..c70246f7fb5d8 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1060,13 +1060,6 @@ class misc_commandscript : public CommandScript
             return false;
         }
 
-        if (area->exploreFlag < 0)
-        {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
         int32 offset = area->exploreFlag / 32;
         if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
         {
@@ -1104,13 +1097,6 @@ class misc_commandscript : public CommandScript
             return false;
         }
 
-        if (area->exploreFlag < 0)
-        {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
         int32 offset = area->exploreFlag / 32;
         if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
         {