1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1ee0db0..735dddb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -934,6 +934,11 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 avatar.Close();
             }
+            catch (System.NullReferenceException NE)
+            {
+                //We can safely ignore null reference exceptions.  It means the avatar are dead and cleaned up anyway.
+
+            }     
             catch (Exception e)
             {
                 MainLog.Instance.Error("Scene.cs:RemoveClient exception: " + e.ToString());