1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bfdf517..ac37fdd 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1358,7 +1358,15 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_scenePresences.ContainsKey(agentID))
                 {
-                    m_scenePresences[agentID].MakeRootAgent(position, isFlying);
+                    try
+                    {
+                        m_scenePresences[agentID].MakeRootAgent(position, isFlying);
+                    }
+                    catch (System.Exception e)
+                    {
+                        MainLog.Instance.Verbose("SCENE", "Unable to do Agent Crossing.");
+                        MainLog.Instance.Debug("SCENE",e.ToString());
+                    }
                     //m_innerScene.SwapRootChildAgent(false);
                 }
             }