diff --git a/src/bot.ts b/src/bot.ts
index 6ce62ff1a267298ae9d092fb04a2e9116a382ee5..8ddcf134cc2f83e7401d34c98f50a44d73b8fe1d 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -458,7 +458,7 @@ export class DiscordBot {
     });
 
     // Sending was a success
-    return Promise.resolve(true);
+    return true;
   }
 
   private AddGuildMember(guildMember: Discord.GuildMember) {
@@ -623,7 +623,9 @@ export class DiscordBot {
     const editedMsg = await this.msgProcessor.FormatEdit(oldMsg, newMsg);
 
     // Send the message to all bridged matrix rooms
-    this.SendMatrixMessage(editedMsg, newMsg.channel, newMsg.guild, newMsg.author, newMsg.id);
+    if (!await this.SendMatrixMessage(editedMsg, newMsg.channel, newMsg.guild, newMsg.author, newMsg.id)) {
+      log.error("DiscordBot", "Unable to announce message edit for msg id:", newMsg.id);
+    }
   }
 
     private async DeleteDiscordMessage(msg: Discord.Message) {
diff --git a/src/messageprocessor.ts b/src/messageprocessor.ts
index 5a24615f0f70c397a48d143f31b384299f338685..f02893357d4fd442546ed0a3beb85fae02053163 100644
--- a/src/messageprocessor.ts
+++ b/src/messageprocessor.ts
@@ -74,7 +74,7 @@ export class MessageProcessor {
     public async FormatEdit(oldMsg: Discord.Message, newMsg: Discord.Message): Promise<MessageProcessorMatrixResult> {
         // TODO: Produce a nice, colored diff between the old and new message content
         oldMsg.content = "*edit:* ~~" + oldMsg.content + "~~ -> " + newMsg.content;
-        return await this.FormatDiscordMessage(oldMsg);
+        return this.FormatDiscordMessage(oldMsg);
     }
 
     public InsertEmbeds(content: string, msg: Discord.Message): string {