diff --git a/Content.Shared/IdentityManagement/Identity.cs b/Content.Shared/IdentityManagement/Identity.cs index 2fb53e3d5a9b..cdb3c81adacc 100644 --- a/Content.Shared/IdentityManagement/Identity.cs +++ b/Content.Shared/IdentityManagement/Identity.cs @@ -15,6 +15,9 @@ public static class Identity /// public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer=null) { + if (!uid.IsValid()) + return string.Empty; + var meta = ent.GetComponent(uid); if (meta.EntityLifeStage <= EntityLifeStage.Initializing) return meta.EntityName; // Identity component and such will not yet have initialized and may throw NREs