diff --git a/OpenRa.Game/Traits/AttackBase.cs b/OpenRa.Game/Traits/AttackBase.cs
index c14d2768ea..91c56f1a42 100644
--- a/OpenRa.Game/Traits/AttackBase.cs
+++ b/OpenRa.Game/Traits/AttackBase.cs
@@ -38,7 +38,7 @@ namespace OpenRa.Game.Traits
 
 		public void DoAttack(Actor self)
 		{
-			var unit = self.traits.Get<Unit>();
+			var unit = self.traits.GetOrDefault<Unit>();
 
 			if (self.Info.Primary != null && CheckFire(self, unit, self.Info.Primary, ref primaryFireDelay,
 				self.Info.PrimaryOffset))
diff --git a/units.ini b/units.ini
index 01a51517f8..f4b26a067e 100755
--- a/units.ini
+++ b/units.ini
@@ -278,7 +278,7 @@ Footprint=_ x
 SelectionPriority=3
 [GUN]
 Description=Turret
-Traits=Building, Turreted, RenderBuildingTurreted
+Traits=Building, Turreted, RenderBuildingTurreted, AttackTurreted
 Dimensions=1,1
 Footprint=x
 SelectionPriority=3