1 files changed, 9 insertions, 3 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 353a24c..dc3d810 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -152,8 +152,14 @@ namespace OpenSim.Region.ClientStack
         public void Close()
         {
             clientPingTimer.Stop();
-
-            m_scene.RemoveClient(AgentId);
+            try
+            {
+                m_scene.RemoveClient(AgentId);
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.Error("ClientView.cs:Close, exception: " + e.ToString());
+            }
 
             ClientThread.Abort();
         }
@@ -389,4 +395,4 @@ namespace OpenSim.Region.ClientStack
             ClientThread.Abort();
         }
     }
-}
\ No newline at end of file
+}