1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index da81c03..6495899 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1258,7 +1258,7 @@ namespace OpenSim.Region.Framework.Scenes
             //
             // TODO: Find a better place for this
             //
-            while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero)
+            while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
             {
                 MainConsole.Instance.Output("The current estate has no owner set.");
                 string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test");