1 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index e6b8364..b5bb951 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -352,8 +352,11 @@ namespace OpenSim.Region.Environment.Scenes
 
         private void RemoveFromPhysicalScene()
         {
-            m_scene.PhysScene.RemoveAvatar( this.PhysicsActor );
-            this.PhysicsActor = null;
+            if (this.PhysicsActor)
+            {
+                m_scene.PhysScene.RemoveAvatar(this.PhysicsActor);
+                this.PhysicsActor = null;
+            }
         }
 
         /// <summary>
@@ -919,4 +922,4 @@ namespace OpenSim.Region.Environment.Scenes
             RemoveFromPhysicalScene();
         }
     }
-}
\ No newline at end of file
+}