diff --git a/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs b/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs index 9a98c2ece..fe7bf1dc6 100644 --- a/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs +++ b/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs @@ -158,7 +158,9 @@ namespace Robust.Shared.GameObjects angularVelocityDiff += angular; } - if (entity.Transform.Parent!.Owner.TryGetComponent(out PhysicsComponent? newBody)) + var newParent = entity.Transform.Parent?.Owner; + + if (newParent != null && newParent.TryGetComponent(out PhysicsComponent? newBody)) { var (linear, angular) = newBody.MapVelocities;