diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 5e13592066..1e0d2e5a15 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if(m_osslconfig == null)
                 m_osslconfig = m_ScriptEngine.Config;
 
-            m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", m_debuggerSafe);
+            m_debuggerSafe = m_osslconfig.GetBoolean("DebuggerSafe", m_debuggerSafe);
 
             m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
             m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
index 4c7d0bbbb6..c7fdefc2e5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
@@ -68,12 +68,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             IConfig xengineConfig = initConfigSource.AddConfig("XEngine");
             xengineConfig.Set("Enabled", "true");
-            xengineConfig.Set("AllowOSFunctions", "true");
-            xengineConfig.Set("OSFunctionThreatLevel", "Severe");
 
             IConfig oconfig = initConfigSource.AddConfig("OSSL");
             oconfig.Set("DebuggerSafe", false);
-            oconfig.Set("Enabled", "true");
             oconfig.Set("AllowOSFunctions", "true");
             oconfig.Set("OSFunctionThreatLevel", "Severe");