diff --git a/Application/ApplicationManager.cs b/Application/ApplicationManager.cs
index 7847871db..86f39c9f1 100644
--- a/Application/ApplicationManager.cs
+++ b/Application/ApplicationManager.cs
@@ -293,7 +293,7 @@ namespace IW4MAdmin.Application
                             serverConfig.AddEventParser(parser);
                         }
 
-                        newConfig.Servers = newConfig.Servers.Append((ServerConfiguration)serverConfig.Generate()).ToArray();
+                        newConfig.Servers = newConfig.Servers.Where(_servers => _servers != null).Append((ServerConfiguration)serverConfig.Generate()).ToArray();
                     } while (Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["SETUP_SERVER_SAVE"]));
 
                     config = newConfig;
diff --git a/SharedLibraryCore/Configuration/ServerConfiguration.cs b/SharedLibraryCore/Configuration/ServerConfiguration.cs
index afb18630c..1e09bb3f3 100644
--- a/SharedLibraryCore/Configuration/ServerConfiguration.cs
+++ b/SharedLibraryCore/Configuration/ServerConfiguration.cs
@@ -31,9 +31,6 @@ namespace SharedLibraryCore.Configuration
         [ConfigurationOptional]
         public Uri GameLogServerUrl { get; set; }
 
-        [ConfigurationIgnore]
-        public int Index { get; set; }
-
         private readonly IList<IRConParser> rconParsers;
         private readonly IList<IEventParser> eventParsers;