From 804d61a6a166944275c297064b727d66e8edfcd0 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 21 Nov 2019 00:00:04 +0100
Subject: [PATCH] Fix DeliverUnit-related crash

---
 OpenRA.Mods.Common/Activities/DeliverUnit.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Activities/DeliverUnit.cs b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
index dca10beb59..79bff40964 100644
--- a/OpenRA.Mods.Common/Activities/DeliverUnit.cs
+++ b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
@@ -97,8 +97,14 @@ namespace OpenRA.Mods.Common.Activities
 				// Put back into world
 				self.World.AddFrameEndTask(w =>
 				{
+					if (self.IsDead)
+						return;
+
 					var cargo = carryall.Carryable;
-					var carryable = carryall.Carryable.Trait<Carryable>();
+					if (cargo == null)
+						return;
+
+					var carryable = cargo.Trait<Carryable>();
 					w.Add(cargo);
 					carryall.DetachCarryable(self);
 					carryable.UnReserve(cargo);