diff --git a/OpenRA.Mods.Common/Lint/CheckPlayers.cs b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
index f5629967a0..68784d2bc2 100644
--- a/OpenRA.Mods.Common/Lint/CheckPlayers.cs
+++ b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
@@ -72,7 +72,12 @@ namespace OpenRA.Mods.Common.Lint
 				{
 					var ownerName = ownerInit.PlayerName;
 					if (!playerNames.Contains(ownerName))
-						emitError("Actor {0} is owned by unknown player {1}.".F(actorReference.Type, ownerName));
+						emitError("Actor {0} is owned by unknown player {1}.".F(kv.Key, ownerName));
+					else if (kv.Value.Value == "mpspawn" && !players[ownerName].OwnsWorld)
+					{
+						emitError("Actor {0} needs to be owned by the player that owns the world. ".F(kv.Key) +
+							"Use the `Spawn` and `LockSpawn` player properties to force players onto a particular spawn instead.");
+					}
 				}
 			}
 		}
diff --git a/mods/cnc/maps/treasure-island-2.oramap b/mods/cnc/maps/treasure-island-2.oramap
index 6af5ec5114..7427343f36 100644
Binary files a/mods/cnc/maps/treasure-island-2.oramap and b/mods/cnc/maps/treasure-island-2.oramap differ
diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap
index 5ba913e3b6..0cec40de59 100644
Binary files a/mods/d2k/maps/the-duell.oramap and b/mods/d2k/maps/the-duell.oramap differ