diff --git a/OpenRA.Mods.RA/Crates/CloakCrateAction.cs b/OpenRA.Mods.RA/Crates/CloakCrateAction.cs
index 53752dfc8c..bf6702200f 100644
--- a/OpenRA.Mods.RA/Crates/CloakCrateAction.cs
+++ b/OpenRA.Mods.RA/Crates/CloakCrateAction.cs
@@ -52,8 +52,8 @@ namespace OpenRA.Mods.RA.Crates
 					w.Remove(collector);
 
 					collector.AddTrait(cloak);
-					if (collector.HasTrait<TargetableUnit<TargetableUnitInfo>>())
-						collector.Trait<TargetableUnit<TargetableUnitInfo>>().ReceivedCloak(collector);
+					var t = collector.TraitOrDefault<TargetableUnit<TargetableUnitInfo>>();
+					if (t != null) t.ReceivedCloak(collector);
 
 					w.Add(collector);
 				});