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