diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 0c083efa1..f50a46bee 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -849,7 +849,7 @@ var InternalClient = (function () {
 
 	InternalClient.prototype.deleteMessages = function deleteMessages(_messages) {
 		if (!_messages instanceof Array) return Promise.reject(new Error("Messages provided must be in an array"));
-		if (_messages.length < 1) return Promise.reject(new Error("You must provide at least one message to delete"));
+		if (_messages.length < 2) return Promise.reject(new Error("You must provide at least two messages to delete"));
 
 		var messages = [];
 		var channel;
@@ -870,6 +870,10 @@ var InternalClient = (function () {
 			var message = this.resolver.resolveMessage(_message);
 			if (!message) return Promise.reject(new Error("Something other than a message could not be resolved in the array..."));
 
+			if (!message.server) {
+				return Promise.reject(new Error("You can only bulk delete messages on guild channels"));
+			}
+
 			// ensure same channel
 			if (!channel) {
 				channel = message.channel;
diff --git a/lib/Util/TokenCacher-shim.js b/lib/Util/TokenCacher-shim.js
index f483e9575..53412d365 100644
--- a/lib/Util/TokenCacher-shim.js
+++ b/lib/Util/TokenCacher-shim.js
@@ -6,23 +6,23 @@ exports.__esModule = true;
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 var TokenCacher = (function () {
-			function TokenCacher() {
-						_classCallCheck(this, TokenCacher);
-			}
+	function TokenCacher() {
+		_classCallCheck(this, TokenCacher);
+	}
 
-			TokenCacher.prototype.setToken = function setToken() {};
+	TokenCacher.prototype.setToken = function setToken() {};
 
-			TokenCacher.prototype.save = function save() {};
+	TokenCacher.prototype.save = function save() {};
 
-			TokenCacher.prototype.getToken = function getToken() {
-						return null;
-			};
+	TokenCacher.prototype.getToken = function getToken() {
+		return null;
+	};
 
-			TokenCacher.prototype.init = function init(ind) {
-						this.done = true;
-			};
+	TokenCacher.prototype.init = function init(ind) {
+		this.done = true;
+	};
 
-			return TokenCacher;
+	return TokenCacher;
 })();
 
 exports["default"] = TokenCacher;
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index c51584cfc..dd589a55b 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -701,8 +701,9 @@ export default class InternalClient {
 	deleteMessages(_messages) {
 		if (!_messages instanceof Array)
 			return Promise.reject(new Error("Messages provided must be in an array"));
-		if (_messages.length < 1)
-			return Promise.reject(new Error("You must provide at least one message to delete"))
+		if (_messages.length < 2)
+			return Promise.reject(new Error("You must provide at least two messages to delete"));
+
 
 		var messages = [];
 		var channel;
@@ -711,6 +712,10 @@ export default class InternalClient {
 			if (!message)
 				return Promise.reject(new Error("Something other than a message could not be resolved in the array..."));
 
+			if(!message.server) {
+				return Promise.reject(new Error("You can only bulk delete messages on guild channels"));
+			}
+
 			// ensure same channel
 			if (!channel) {
 				channel = message.channel;