diff --git a/Content.Shared/Physics/ThrowController.cs b/Content.Shared/Physics/ThrowController.cs index 69f237c7ad..5b71fe3394 100644 --- a/Content.Shared/Physics/ThrowController.cs +++ b/Content.Shared/Physics/ThrowController.cs @@ -33,7 +33,7 @@ namespace Content.Shared.Physics public void StopThrow() { - if (_component == null) return; + if (_component == null || _component.Owner.Deleted) return; if (IoCManager.Resolve().IsWeightless(_component.Owner.Transform.GridPosition)) { Timer.Spawn((int) (ThrowTime * 1000), StopThrow);