1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 07c77aa..80634c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -66,7 +66,14 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_currentScene == null)
                 {
-                    return m_localScenes[0];
+                    if (m_localScenes.Count > 0)
+                    {
+                        return m_localScenes[0];
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
                 else
                 {