diff --git a/OpenRA.Mods.Common/Traits/Carryall.cs b/OpenRA.Mods.Common/Traits/Carryall.cs
index 4f53b0f27e..1f81334c85 100644
--- a/OpenRA.Mods.Common/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -288,7 +288,7 @@ namespace OpenRA.Mods.Common.Traits
 
 			static bool CanTarget(Actor self, Actor target)
 			{
-				if (!target.AppearsFriendlyTo(self))
+				if (target == null || !target.AppearsFriendlyTo(self))
 					return false;
 
 				var carryable = target.TraitOrDefault<Carryable>();
diff --git a/OpenRA.Mods.Common/Traits/RevealOnFire.cs b/OpenRA.Mods.Common/Traits/RevealOnFire.cs
index 4edeb16f59..fdbec09e17 100644
--- a/OpenRA.Mods.Common/Traits/RevealOnFire.cs
+++ b/OpenRA.Mods.Common/Traits/RevealOnFire.cs
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			if (target.Type == TargetType.Actor)
 				return target.Actor.Owner;
-			else if (target.Type == TargetType.FrozenActor && !target.FrozenActor.Actor.IsDead)
+			else if (target.Type == TargetType.FrozenActor && target.FrozenActor.Actor != null && !target.FrozenActor.Actor.IsDead)
 				return target.FrozenActor.Actor.Owner;
 
 			return null;