1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs
index b090e8c..6129407 100644
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ b/OpenSim/Servers/Base/ServicesServerBase.cs
@@ -125,7 +125,10 @@ namespace OpenSim.Servers.Base
 
             // Refresh the startupConfig post merge
             //
-            startupConfig = argvConfig.Configs["Startup"];
+            if (m_Config.Configs["Startup"] != null)
+            {
+                startupConfig = m_Config.Configs["Startup"];
+            }
 
             // Allow derived classes to load config before the console is
             // opened.