1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 1f2c54d..a7cffd7 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -139,10 +139,12 @@ namespace OpenSim.Server.Base
                 startupConfig = Config.Configs["Startup"];
             }
 
-            ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
-
-            prompt = startupConfig.GetString("Prompt", prompt);
+            if (startupConfig != null)
+            {
+                ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
 
+                prompt = startupConfig.GetString("Prompt", prompt);
+            }
             // Allow derived classes to load config before the console is opened.
             ReadConfig();