diff --git a/src/plugins/MessageSaver.ts b/src/plugins/MessageSaver.ts
index e60054f1..24adafc3 100644
--- a/src/plugins/MessageSaver.ts
+++ b/src/plugins/MessageSaver.ts
@@ -96,7 +96,7 @@ export class MessageSaverPlugin extends Plugin<IMessageSaverPluginConfig> {
   }
 
   @d.command("save_messages_to_db", "<channel:channel> <ids:string...>")
-  @d.permission("manage")
+  @d.permission("can_manage")
   async saveMessageCmd(msg: Message, args: { channel: GuildChannel & TextChannel; ids: string[] }) {
     await msg.channel.createMessage("Saving specified messages...");
 
@@ -115,7 +115,7 @@ export class MessageSaverPlugin extends Plugin<IMessageSaverPluginConfig> {
   }
 
   @d.command("save_pins_to_db", "<channel:channel>")
-  @d.permission("manage")
+  @d.permission("can_manage")
   async savePinsCmd(msg: Message, args: { channel: GuildChannel & TextChannel }) {
     await msg.channel.createMessage(`Saving pins from <#${args.channel.id}>...`);
 
diff --git a/src/plugins/ReactionRoles.ts b/src/plugins/ReactionRoles.ts
index 5e0940bb..c6904b4b 100644
--- a/src/plugins/ReactionRoles.ts
+++ b/src/plugins/ReactionRoles.ts
@@ -121,6 +121,7 @@ export class ReactionRolesPlugin extends ZeppelinPlugin<IReactionRolesPluginConf
    */
   async applyReactionRoleReactionsToMessage(channelId: string, messageId: string, reactionRoles: ReactionRole[]) {
     const channel = this.guild.channels.get(channelId) as TextChannel;
+    if (!channel) return;
 
     let targetMessage;
     try {