diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
index f4cbc1fc33..8e419d071d 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
@@ -273,7 +273,6 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                     break;
             }
 
-
             m_MaintenanceInterval = m_Config.GetInt("MaintenanceInterval", 10);
 
             if(m_MaintenanceInterval > 0)
@@ -904,6 +903,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
         //
         public bool PostObjectEvent(uint localID, EventParams parms)
         {
+            if(m_Exiting)
+                return false;
+
             SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
 
             if(part == null)
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
index 7ef1b9f08e..32b26f5799 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs
@@ -260,8 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
             {
                  // Say how long to sleep.
                 m_SleepUntil = DateTime.UtcNow + TimeSpan.FromMilliseconds(ms);
-
-                 // Don't wake on any events.
+                // Don't wake on any events.
                 m_SleepEventMask1 = 0;
                 m_SleepEventMask2 = 0;
             }