1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e6f7235..b44a010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,6 +179,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Reset()
         {
+            if (m_pendingObjects == null)
+                return;
+
             lock (m_pendingObjects)
             {
                 if (m_pendingObjects != null)