diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
index 0c601992e0..63558b2686 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
@@ -206,7 +206,7 @@ namespace OpenRA.Mods.Common.Traits
 					lastVisibleMinimumRange = attack.GetMinimumRange();
 
 					// Try and sit at least one cell away from the min or max ranges to give some leeway if the target starts moving.
-					if (target.Actor.Info.HasTraitInfo<IMoveInfo>())
+					if (move != null && target.Actor.Info.HasTraitInfo<IMoveInfo>())
 					{
 						var preferMinRange = Math.Min(lastVisibleMinimumRange.Length + 1024, lastVisibleMaximumRange.Length);
 						var preferMaxRange = Math.Max(lastVisibleMaximumRange.Length - 1024, lastVisibleMinimumRange.Length);