1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a5fcf4d..ee5f6df 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5943,6 +5943,9 @@ Environment.Exit(1);
 
         public string GetExtraSetting(string name)
         {
+            if (m_extraSettings == null)
+                return String.Empty;
+
             string val;
 
             if (!m_extraSettings.TryGetValue(name, out val))