diff --git a/OpenRA.Game/Traits/Attack/AttackBase.cs b/OpenRA.Game/Traits/Attack/AttackBase.cs
index 8208980c8b..bebd1ee7d9 100644
--- a/OpenRA.Game/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Game/Traits/Attack/AttackBase.cs
@@ -182,7 +182,8 @@ namespace OpenRA.Traits
 				if (Rules.ProjectileInfo[weapon.Projectile].ROT != 0)
 				{
 					var fireFacing = thisLocalOffset.ElementAtOrDefault(2) + 
-						(self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing : unit.Facing);
+						(self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing : 
+						unit != null ? unit.Facing : Util.GetFacing( thisTarget.CenterLocation - self.CenterLocation, 0 ));
 	
 					self.World.Add(new Missile(weapon, self.Owner, self,
 						firePos, thisTarget, srcAltitude, fireFacing));
diff --git a/mods/cnc/vehicles.yaml b/mods/cnc/vehicles.yaml
index 3ab479e78f..21b96735ef 100644
--- a/mods/cnc/vehicles.yaml
+++ b/mods/cnc/vehicles.yaml
@@ -279,7 +279,7 @@ HTNK:
 	Turreted:
 		ROT: 5
 	AttackTurreted:
-		PrimaryWeapon: 120mmAPR
+		PrimaryWeapon: 120mm
 		SecondaryWeapon: MissilePack
 		Recoil: 3
 	RenderUnitTurreted:
diff --git a/mods/cnc/weapons.ini b/mods/cnc/weapons.ini
index 89fb856563..9cd4408132 100644
--- a/mods/cnc/weapons.ini
+++ b/mods/cnc/weapons.ini
@@ -14,7 +14,7 @@ Chemspray
 Grenade
 70mm
 105mm
-120mmAPR
+120mm
 TurretGun
 MissilePack
 227mm
@@ -154,7 +154,7 @@ Report=TNKFIRE4
 ;Anim=GUNFIRE
 
 ; large anti-armor cannon
-[120mmAPR]
+[120mm]
 Damage=40
 ROF=80
 Range=4.75