1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4c96e4e..67048bf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1329,8 +1329,12 @@ namespace OpenSim.Region.Environment.Scenes
                         new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
                         new Quaternion(RotationOffset.W, RotationOffset.X,
                                        RotationOffset.Y, RotationOffset.Z), usePhysics);
-                    PhysActor.LocalID = LocalId;
-                    DoPhysicsPropertyUpdate(usePhysics, true);
+
+                    if (PhysActor != null)
+                    {
+                        PhysActor.LocalID = LocalId;
+                        DoPhysicsPropertyUpdate(usePhysics, true);
+                    }
                 }
                 else
                 {