diff --git a/OpenRA.Mods.Common/Pathfinder/HierarchicalPathFinder.cs b/OpenRA.Mods.Common/Pathfinder/HierarchicalPathFinder.cs
index ba066942cc..8b629d7c6c 100644
--- a/OpenRA.Mods.Common/Pathfinder/HierarchicalPathFinder.cs
+++ b/OpenRA.Mods.Common/Pathfinder/HierarchicalPathFinder.cs
@@ -749,6 +749,9 @@ namespace OpenRA.Mods.Common.Pathfinder
 			if (costEstimator == null)
 				return false;
 
+			if (!world.Map.Contains(source) || !world.Map.Contains(target))
+				return false;
+
 			RebuildDomains();
 
 			var sourceGridInfo = gridInfos[GridIndex(source)];