diff --git a/OpenRa.Game/Traits/ChronoshiftPower.cs b/OpenRa.Game/Traits/ChronoshiftPower.cs
index 8d77432ff3..1ee2f555f8 100644
--- a/OpenRa.Game/Traits/ChronoshiftPower.cs
+++ b/OpenRa.Game/Traits/ChronoshiftPower.cs
@@ -90,8 +90,7 @@ namespace OpenRa.Traits
 				{
 					var loc = mi.Location + Game.viewport.Location;
 					var underCursor = world.FindUnits(loc, loc)
-						.Where(a => a.Owner == world.LocalPlayer
-							&& a.traits.Contains<Chronoshiftable>()
+						.Where(a => a.Owner != null && a.traits.Contains<Chronoshiftable>()
 							&& a.traits.Contains<Selectable>()).FirstOrDefault();
 
 					if (underCursor != null)
diff --git a/OpenRa.Game/Traits/IronCurtainPower.cs b/OpenRa.Game/Traits/IronCurtainPower.cs
index 77adbe0e72..f91463482a 100644
--- a/OpenRa.Game/Traits/IronCurtainPower.cs
+++ b/OpenRa.Game/Traits/IronCurtainPower.cs
@@ -28,7 +28,7 @@ namespace OpenRa.Traits
 		{
 			if (order.OrderString == "IronCurtain")
 			{
-				var curtain = self.World.Actors.Where(a => a.Owner == self.Owner
+				var curtain = self.World.Actors.Where(a => a.Owner != null
 					&& a.traits.Contains<IronCurtain>()).FirstOrDefault();
 				if (curtain != null)
 					curtain.traits.Get<RenderBuilding>().PlayCustomAnim(curtain, "active");