diff --git a/OpenRA.Mods.Cnc/RenderCargo.cs b/OpenRA.Mods.Cnc/RenderCargo.cs
index ee5b9f926a..8a7a29009a 100644
--- a/OpenRA.Mods.Cnc/RenderCargo.cs
+++ b/OpenRA.Mods.Cnc/RenderCargo.cs
@@ -36,9 +36,12 @@ namespace OpenRA.Mods.Cnc
 			foreach (var c in cargo.Passengers)
 			{
 				c.Trait<ITeleportable>().SetPxPosition( c, self.Trait<IHasLocation>().PxPosition );
-				if (facing != null && c.HasTrait<IFacing>())
-					c.Trait<IFacing>().Facing = facing.Facing;
+
+				var cargoFacing = c.TraitOrDefault<IFacing>();
+				if (facing != null && cargoFacing != null)
+					cargoFacing.Facing = facing.Facing;
 			}
+
 			return r.Concat(cargo.Passengers.SelectMany(a => a.Render()));
 		}
 	}