diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index f75e4f3973..568fd6af47 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -557,7 +557,8 @@ namespace Content.Shared.Interaction else { originPos = Transform(origin).MapPosition; - targetRot = Transform(Transform(other).ParentUid).LocalRotation + otherAngle; + var otherParent = Transform(other).ParentUid; + targetRot = otherParent.IsValid() ? Transform(otherParent).LocalRotation + otherAngle : otherAngle; } // Do a raycast to check if relevant