diff --git a/PluralKit.Bot/Services/EmbedService.cs b/PluralKit.Bot/Services/EmbedService.cs index 373e867f..4e2e3fb3 100644 --- a/PluralKit.Bot/Services/EmbedService.cs +++ b/PluralKit.Bot/Services/EmbedService.cs @@ -84,11 +84,15 @@ namespace PluralKit.Bot { if (system.Tag != null) eb.Field(new("Tag", system.Tag.EscapeMarkdown(), true)); - if (cctx.MessageContext.SystemGuildTag != null && cctx.MessageContext.TagEnabled) - eb.Field(new($"Tag (in server '{cctx.Guild.Name}')", cctx.MessageContext.SystemGuildTag.EscapeMarkdown(), true)); + if (cctx.Guild != null) + { + if (cctx.MessageContext.SystemGuildTag != null && cctx.MessageContext.TagEnabled) + eb.Field(new($"Tag (in server '{cctx.Guild.Name}')", cctx.MessageContext.SystemGuildTag + .EscapeMarkdown(), true)); - if (!cctx.MessageContext.TagEnabled) - eb.Field(new($"Tag (in server '{cctx.Guild.Name}')", "*(tag is disabled in this server)*")); + if (!cctx.MessageContext.TagEnabled) + eb.Field(new($"Tag (in server '{cctx.Guild.Name}')", "*(tag is disabled in this server)*")); + } if (!system.Color.EmptyOrNull()) eb.Field(new("Color", $"#{system.Color}", true));