diff --git a/src/client/actions/GuildRoleDelete.js b/src/client/actions/GuildRoleDelete.js
index <HASH>..<HASH> 100644
--- a/src/client/actions/GuildRoleDelete.js
+++ b/src/client/actions/GuildRoleDelete.js
@@ -16,7 +16,7 @@ class GuildRoleDeleteAction extends Action {
     if (guild) {
       let exists = guild.roles.get(data.role_id);
       if (exists) {
-        guild.roles.remove(data.role_id);
+        guild.roles.delete(data.role_id);
         this.deleted[guild.id + data.role_id] = exists;
         this.scheduleForDeletion(guild.id, data.role_id);
         client.emit(Constants.Events.GUILD_ROLE_DELETE, guild, exists);
diff --git a/src/structures/Message.js b/src/structures/Message.js
index <HASH>..<HASH> 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -88,6 +88,12 @@ class Message {
      * @type {String}
      */
     this.id = data.id;
+    /**
+     * A map of roles mentioned in the message, the key is the role ID.
+     * @type {Map<String, Role>}
+     */
+    this.roleMentions = new Map();
+
     for (const mention of data.mentions) {
       let user = this.client.users.get(mention.id);
       if (user) {
Fixed Guild Role Delete Handling