diff --git a/src/modals/editKnowledgebaseItemModal.ts b/src/modals/editKnowledgebaseItemModal.ts
index 34a2461..4fa0875 100644
--- a/src/modals/editKnowledgebaseItemModal.ts
+++ b/src/modals/editKnowledgebaseItemModal.ts
@@ -18,7 +18,8 @@ class EditKnowledgebaseItemModal implements Modal<Client> {
       const content = interaction.fields.getTextInputValue('content');
       if (content.length > 2000) throw new Error('Content cannot be longer than 2000 characters.');
 
-      await logCustomEvent(interaction.guild!, {
+      const guild = await context.guilds.fetch(interaction.guildId);
+      await logCustomEvent(guild, {
         title: 'Knowledgebase Item Edited',
         description: null,
         color: 0xFFFF00,
@@ -39,4 +40,4 @@ class EditKnowledgebaseItemModal implements Modal<Client> {
   }
 }
 
-export default new EditKnowledgebaseItemModal();
\ No newline at end of file
+export default new EditKnowledgebaseItemModal();
diff --git a/src/modals/reportMessage.ts b/src/modals/reportMessage.ts
index aef683c..0f8fa6f 100644
--- a/src/modals/reportMessage.ts
+++ b/src/modals/reportMessage.ts
@@ -11,7 +11,7 @@ class ReportMessageModal implements Modal<Client> {
     await interaction.deferReply({ flags: [MessageFlags.Ephemeral] });
 
     try {
-      const guild = await context.guilds.fetch(interaction.guildId!);
+      const guild = await context.guilds.fetch(interaction.guildId);
       const member = await guild.members.fetch(interaction.user.id);
       const reportedMessageChannel = await guild.channels.fetch(channelId) as GuildTextBasedChannel;
       const reportedMessage = await reportedMessageChannel?.messages.fetch(messageId);
@@ -72,12 +72,7 @@ class ReportMessageModal implements Modal<Client> {
           const thread = await createPrivateHelpTicketThread(context, guild, member, `Ticket created with message report (${reportMessage.url}). ${member}, use this channel to talk with staff privately about the reported message (${reportedMessage.url}). ${additionalInfo ? `\n\nAdditional information provided in report:\n${additionalInfo.split('\n').map(c => `> ${c}`).join('\n')}` : ''}`);
           if (thread) {
             replyContent += ` Private help ticket created: ${thread}.`;
-
-            embed.addFields({
-              name: 'Private Help Ticket',
-              value: thread.url,
-              inline: false
-            });
+            embed.addFields({ name: 'Private Help Ticket', value: thread.url, inline: false });
 
             await reportMessage.edit({ embeds: [embed] });
           } else {
@@ -98,4 +93,4 @@ class ReportMessageModal implements Modal<Client> {
   }
 }
 
-export default new ReportMessageModal();
\ No newline at end of file
+export default new ReportMessageModal();