diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 715a36be3..2a83c85aa 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -843,8 +843,6 @@ var InternalClient = (function () {
 			};
 		};
 
-		console.log(roleIDs);
-
 		return this.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(roles[0].server.id) + "/" + member.id, true, {
 			roles: roleIDs
 		});
@@ -1374,7 +1372,6 @@ var InternalClient = (function () {
 					}
 					break;
 				case _Constants.PacketType.MESSAGE_DELETE:
-					// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete
 					var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
 					if (channel) {
 						// potentially blank
@@ -1382,6 +1379,8 @@ var InternalClient = (function () {
 						client.emit("messageDeleted", msg, channel);
 						if (msg) {
 							channel.messages.remove(msg);
+						} else {
+							client.emit("warn", "message was deleted but message is not cached");
 						}
 					} else {
 						client.emit("warn", "message was deleted but channel is not cached");
diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js
index d3a0a6345..650bce8e9 100644
--- a/lib/Util/Cache.js
+++ b/lib/Util/Cache.js
@@ -26,7 +26,7 @@ var Cache = (function (_Array) {
 			key = null;
 		} else if (key === this[discrimS] && typeof value === "string") {
 			return this[discrimCacheS][value] || null;
-		} else if (value.constructor.name === 'RegExp') {
+		} else if (value && value.constructor.name === 'RegExp') {
 			var valid = function valid(item) {
 				return value.test(item);
 			};
@@ -68,7 +68,7 @@ var Cache = (function (_Array) {
 		if (typeof key === 'function') {
 			var valid = key;
 			key = null;
-		} else if (value.constructor.name === 'RegExp') {
+		} else if (value && value.constructor.name === 'RegExp') {
 			var valid = function valid(item) {
 				return value.test(item);
 			};
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index a4e64d532..bd373083f 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -690,8 +690,6 @@ export default class InternalClient {
 			};
 		};
 
-		console.log(roleIDs);
-
 		return this.apiRequest(
 			"patch",
 			`${Endpoints.SERVER_MEMBERS(roles[0].server.id)}/${member.id}`,
@@ -1169,7 +1167,6 @@ export default class InternalClient {
 					}
 					break;
 				case PacketType.MESSAGE_DELETE:
-					// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete
 					var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
 					if (channel) {
 						// potentially blank
@@ -1177,6 +1174,8 @@ export default class InternalClient {
 						client.emit("messageDeleted", msg, channel);
 						if (msg) {
 							channel.messages.remove(msg);
+						} else {
+							client.emit("warn", "message was deleted but message is not cached");
 						}
 					} else {
 						client.emit("warn", "message was deleted but channel is not cached");
diff --git a/src/Util/Cache.js b/src/Util/Cache.js
index d5a86c8bf..52b092a68 100644
--- a/src/Util/Cache.js
+++ b/src/Util/Cache.js
@@ -16,7 +16,7 @@ export default class Cache extends Array {
 			key = null;
 		} else if (key === this[discrimS] && typeof value === "string") {
 			return this[discrimCacheS][value] || null;
-		} else if (value.constructor.name === 'RegExp') {
+		} else if (value && value.constructor.name === 'RegExp') {
 			var valid = function valid(item) {
 				return value.test(item);
 			}
@@ -45,7 +45,7 @@ export default class Cache extends Array {
 		if (typeof key === 'function') {
 			var valid = key;
 			key = null;
-		} else if (value.constructor.name === 'RegExp') {
+		} else if (value && value.constructor.name === 'RegExp') {
 			var valid = function valid(item) {
 				return value.test(item);
 			}