diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs index 3b1ec3fa08..59fd9a5d69 100644 --- a/Content.Server/Prayer/PrayerSystem.cs +++ b/Content.Server/Prayer/PrayerSystem.cs @@ -56,7 +56,9 @@ public sealed class PrayerSystem : EntitySystem _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString(comp.Verb), Loc.GetString("prayer-popup-notify-pray-ui-message"), (string message) => { - Pray(actor.PlayerSession, comp, message); + // Make sure the player's entity and the Prayable entity+component still exist + if (actor?.PlayerSession != null && HasComp(uid)) + Pray(actor.PlayerSession, comp, message); }); }, Impact = LogImpact.Low,