1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
index e403385..1e4dc99 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
@@ -202,6 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         public void CheckHttpRequests()
         {
+            if (m_ScriptEngine.World == null)
+                return;
+
             IHttpRequests iHttpReq =
                 m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>();
 
@@ -241,6 +244,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         public void CheckXMLRPCRequests()
         {
+            if (m_ScriptEngine.World == null)
+                return;
+
             IXMLRPC xmlrpc = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
 
             if (xmlrpc != null)
@@ -266,6 +272,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         public void CheckListeners()
         {
+            if (m_ScriptEngine.World == null)
+                return;
             IWorldComm comms = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
 
             while (comms.HasMessages())