diff --git a/OpenRA.Mods.Common/Activities/WaitForTransport.cs b/OpenRA.Mods.Common/Activities/WaitForTransport.cs
index 2e039f3426..791b36f38a 100644
--- a/OpenRA.Mods.Common/Activities/WaitForTransport.cs
+++ b/OpenRA.Mods.Common/Activities/WaitForTransport.cs
@@ -45,7 +45,8 @@ namespace OpenRA.Mods.Common.Activities
 			if (transportable != null)
 				transportable.WantsTransport = false;
 
-			inner.Cancel(self);
+			if (inner != null)
+				inner.Cancel(self);
 		}
 	}
 }