diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs index 115d237aae..1023238a52 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs @@ -54,16 +54,22 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine // New region is being created // Create a new script engine // Make sure we have config - if (ConfigSource.Configs["SECS"] == null) - ConfigSource.AddConfig("SECS"); - ScriptConfigSource = ConfigSource.Configs["SECS"]; - - // Is SECS enabled? - if (ScriptConfigSource.GetBoolean("Enabled", false)) + try + { + if (ConfigSource.Configs["SECS"] == null) + ConfigSource.AddConfig("SECS"); + ScriptConfigSource = ConfigSource.Configs["SECS"]; + + // Is SECS enabled? + if (ScriptConfigSource.GetBoolean("Enabled", false)) + { + LoadEngine(); + if (scriptEngine != null) + scriptEngine.Initialise(scene, source); + } + } + catch (NullReferenceException) { - LoadEngine(); - if (scriptEngine != null) - scriptEngine.Initialise(scene, source); } }