diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 4c66f59f64..2333e38f6d 100755
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -377,8 +377,9 @@ namespace OpenRA.Editor
 						using (var eld = new ErrorListDialog(errors))
 							eld.ShowDialog();
 
-					map.Players.Add("Neutral", new PlayerReference("Neutral",
-						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+					if (!map.Players.ContainsKey("Neutral"))
+						map.Players.Add("Neutral", new PlayerReference("Neutral",
+							Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 					
 					map.Players.Add("Creeps", new PlayerReference("Creeps",
 						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj
index 1ba2ea80c5..f70654d71c 100644
--- a/OpenRA.Editor/OpenRA.Editor.csproj
+++ b/OpenRA.Editor/OpenRA.Editor.csproj
@@ -90,6 +90,9 @@
       <DependentUpon>PropertiesDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="ErrorListDialog.resx">
+      <DependentUpon>ErrorListDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>