diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs
index e3b48db8ec..6c27daacab 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs
@@ -123,6 +123,8 @@ namespace OpenRA.Mods.Common.Traits
 
 				var targetActor = order.Target.Actor;
 			}
+			else
+				return;
 
 			var currentTransform = self.CurrentActivity as Transform;
 			var transform = transforms.FirstOrDefault(t => !t.IsTraitDisabled && !t.IsTraitPaused);