Index: source/simulation2/components/CCmpUnitMotion.cpp
===================================================================
--- source/simulation2/components/CCmpUnitMotion.cpp
+++ source/simulation2/components/CCmpUnitMotion.cpp
@@ -816,6 +816,15 @@
 	if (m_State == STATE_IDLE)
 		return;
 
+	if (m_MoveRequest.m_Type == MoveRequest::ENTITY)
+	{
+		CFixedVector2D targetPos;
+		// If we can't compute our target position, our move will likely fail.
+		// Keep moving along our current path - let callers handle this.
+		if (!ComputeTargetPosition(targetPos))
+			MoveFailed();
+	}
+
 	if (PossiblyAtDestination())
 		MoveSucceeded();