diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index c92d67ba81..bf86d2c1e4 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -112,7 +112,7 @@ public abstract class SharedActionsSystem : EntitySystem bool logError = true) { result = null; - if (!Exists(uid)) + if (uid == null || TerminatingOrDeleted(uid.Value)) return false; var ev = new GetActionDataEvent();