diff --git a/OpenRA.Mods.Common/Traits/BotModules/McvExpansionManagerBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/McvExpansionManagerBotModule.cs
index a44f146d1e..c16a122500 100644
--- a/OpenRA.Mods.Common/Traits/BotModules/McvExpansionManagerBotModule.cs
+++ b/OpenRA.Mods.Common/Traits/BotModules/McvExpansionManagerBotModule.cs
@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Traits
 		IBotRequestUnitProduction[] requestUnitProduction;
 		IBotSuggestRefineryProduction[] suggestRefineryProduction;
 
-		readonly Dictionary<Actor, CPos> activeMCVs = [];
+		readonly Dictionary<Actor, CPos?> activeMCVs = [];
 
 		PathFinder pathfinder;
 		ResourceMapBotModule resourceMapModule;
@@ -667,7 +667,7 @@ namespace OpenRA.Mods.Common.Traits
 				if (desiredLocation == null)
 					return;
 
-				activeMCVs[mcv] = checkloc.Value;
+				activeMCVs[mcv] = checkloc;
 				if (resLoc != null)
 				{
 					foreach (var srp in suggestRefineryProduction)