diff --git a/OpenRa.Game/Traits/Activities/HeliReturn.cs b/OpenRa.Game/Traits/Activities/HeliReturn.cs
index 8da692e3f7..913ab24a84 100644
--- a/OpenRa.Game/Traits/Activities/HeliReturn.cs
+++ b/OpenRa.Game/Traits/Activities/HeliReturn.cs
@@ -35,7 +35,7 @@ namespace OpenRa.Game.Traits.Activities
 				self.traits.Get<Helicopter>().reservation = res.Reserve(self);
 
 			var offset = (dest.Info as BuildingInfo).SpawnOffset;
-			var offsetVec = new float2(offset[0], offset[1]);
+			var offsetVec = offset != null ? new float2(offset[0], offset[1]) : float2.Zero;
 
 			return Util.SequenceActivities(
 				new HeliFly(dest.CenterLocation + offsetVec),
diff --git a/OpenRa.Game/Traits/Helicopter.cs b/OpenRa.Game/Traits/Helicopter.cs
index 1361571a91..2568ed968d 100644
--- a/OpenRa.Game/Traits/Helicopter.cs
+++ b/OpenRa.Game/Traits/Helicopter.cs
@@ -56,7 +56,7 @@ namespace OpenRa.Game.Traits
 					reservation = res.Reserve(self);
 
 				var offset = (order.TargetActor.Info as BuildingInfo).SpawnOffset;
-				var offsetVec = new float2(offset[0], offset[1]);
+				var offsetVec = offset != null ? new float2(offset[0], offset[1]) : float2.Zero;
 
 				self.CancelActivity();
 				self.QueueActivity(new HeliFly(order.TargetActor.CenterLocation + offsetVec));