diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f6df3c31ea..89e511f90e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1864,8 +1864,6 @@ namespace OpenSim.Region.Framework.Scenes
                     if (part.SitTargetAvatar == UUID)
                         part.SitTargetAvatar = UUID.Zero;
 
-                    part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
-
                     ParentPosition = part.GetWorldPosition();
                     ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
                 }
@@ -1881,6 +1879,9 @@ namespace OpenSim.Region.Framework.Scenes
                 ParentID = 0;
                 SendAvatarDataToAllAgents();
                 m_requestedSitTargetID = 0;
+
+                if (part != null)
+                    part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
             }
 
             Animator.TrySetMovementAnimation("STAND");