diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index 6b1728fdd0..8cd539f27b 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -55,13 +55,13 @@ namespace Content.Client.UserInterface protected override void DrawContents() { - if (_playerManager?.LocalPlayer.ControlledEntity == null) + if (_playerManager?.LocalPlayer == null) { return; } IEntity entity = _playerManager.LocalPlayer.ControlledEntity; - if (!entity.TryGetComponent(out var hands)) + if (entity == null || !entity.TryGetComponent(out var hands)) { return; }