From cccf5c5931c7a7b40c13519918980e9742826d84 Mon Sep 17 00:00:00 2001
From: Pavel Penev <penev92@gmail.com>
Date: Sun, 26 Jul 2015 02:15:38 +0300
Subject: [PATCH] Check if the inner activity is null before trying to cancel
 it

---
 OpenRA.Mods.Common/Activities/WaitForTransport.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
 		}
 	}
 }