diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index 4623c07052..46ddb072cd 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -40,7 +40,7 @@ public sealed class MindSystem : SharedMindSystem if (mind.UserId is {} user) { UserMinds.Remove(user); - if (_players.GetPlayerData(user).ContentData() is { } oldData) + if (_players.TryGetPlayerData(user, out var data) && data.ContentData() is { } oldData) oldData.Mind = null; mind.UserId = null; } diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 4951bb7f1c..5dbe62aa6a 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -619,6 +619,9 @@ namespace Content.Shared.Cuffs if (!Resolve(target, ref cuffable) || !Resolve(cuffsToRemove, ref cuff)) return; + if (TerminatingOrDeleted(cuffsToRemove) || TerminatingOrDeleted(target)) + return; + if (user != null) { var attempt = new UncuffAttemptEvent(user.Value, target);