1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
index 563dcfa..0d4be17 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
@@ -173,7 +173,8 @@ public class BSPrimLinkable : BSPrimDisplaced
     // Body is being taken apart. Remove physical dependencies and schedule a rebuild.
     protected override void RemoveDependencies()
     {
-        Linkset.RemoveDependencies(this);
+        if (Linkset != null)
+            Linkset.RemoveDependencies(this);
         base.RemoveDependencies();
     }