diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs
index bf2f74e0ca..1e29706024 100644
--- a/OpenRA.Mods.RA/AttackBase.cs
+++ b/OpenRA.Mods.RA/AttackBase.cs
@@ -248,10 +248,11 @@ namespace OpenRA.Mods.RA
 		{
 			var weapon = ChooseWeaponForTarget(Target.FromOrder(order));
 
-			self.QueueActivity(
-				new Activities.Attack(
-					Target.FromOrder(order), 
-					Math.Max(0, (int)weapon.Info.Range)));
+			if (weapon != null)
+				self.QueueActivity(
+					new Activities.Attack(
+						Target.FromOrder(order), 
+						Math.Max(0, (int)weapon.Info.Range)));
 		}
 
 		public bool HasAnyValidWeapons(Target t) { return Weapons.Any(w => w.IsValidAgainst(t)); }