diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c5f20da8f5..5dbf3b7e6f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2335,8 +2335,11 @@ if (m_shape != null) {
 
         public void SetPhysicsAxisRotation()
         {
-            PhysActor.LockAngularMotion(RotationAxis);
-            m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+            if (PhysActor != null)
+            {
+                PhysActor.LockAngularMotion(RotationAxis);
+                m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+            }
         }
 
         public void SetScriptEvents(UUID scriptid, int events)