diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs
index d336e46b65..ab2291f1a7 100644
--- a/OpenRA.Mods.RA/Effects/GpsDot.cs
+++ b/OpenRA.Mods.RA/Effects/GpsDot.cs
@@ -74,6 +74,9 @@ namespace OpenRA.Mods.RA.Effects
 				return false;
 
 			var f = frozen[self.World.RenderPlayer].FromID(self.ActorID);
+			if (f == null)
+				return false;
+
 			return f.Visible && !f.HasRenderables;
 		}
 
@@ -83,7 +86,7 @@ namespace OpenRA.Mods.RA.Effects
 				world.AddFrameEndTask(w => w.Remove(this));
 
 			show = false;
-			if (!self.IsInWorld || self.Destroyed || self.World.RenderPlayer == null)
+			if (!self.IsInWorld || self.Destroyed || self.IsDead() || self.World.RenderPlayer == null)
 				return;
 
 			var gps = watcher[self.World.RenderPlayer];