diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs
index 5d69008d73..d7df87b0ce 100755
--- a/OpenRA.Mods.RA/Effects/Missile.cs
+++ b/OpenRA.Mods.RA/Effects/Missile.cs
@@ -99,13 +99,14 @@ namespace OpenRA.Mods.RA.Effects
 
 			Altitude += Math.Sign(targetAltitude - Altitude);
 
-			Facing = Traits.Util.TickFacing(Facing,
-				Traits.Util.GetFacing(dist, Facing),
-				Info.ROT);
+			if (Args.target.IsValid)
+				Facing = Traits.Util.TickFacing(Facing,
+					Traits.Util.GetFacing(dist, Facing),
+					Info.ROT);
 
 			anim.Tick();
 
-			if (dist.LengthSquared < MissileCloseEnough * MissileCloseEnough || !Args.target.IsValid )
+			if (dist.LengthSquared < MissileCloseEnough * MissileCloseEnough && Args.target.IsValid )
 				Explode(world);
 
 			// TODO: Replace this with a lookup table