diff --git a/lib/Client.js b/lib/Client.js
index 9526b103c..d5b1125f0 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -310,7 +310,7 @@ var Client = (function () {
 							var _iteratorError4 = undefined;
 
 							try {
-								for (var _iterator4 = data.mentions[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+								for (var _iterator4 = info.mentions[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
 									var mention = _step4.value;
 
 									mentions.push(self.addUser(mention));
@@ -341,6 +341,18 @@ var Client = (function () {
 						// all hell to break loose... best to just act as if nothing happened
 
 						break;
+
+					case "GUILD_DELETE":
+
+						var server = self.getServer("id", data.id);
+
+						if (server) {
+							self.serverCache.splice(self.serverCache.indexOf(server), 1);
+							self.trigger("serverDelete", server);
+						}
+
+						break;
+
 					default:
 						self.debug("received unknown packet");
 						self.trigger("unknown", dat);
diff --git a/src/Client.js b/src/Client.js
index aa71b2758..9642c78c4 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -248,12 +248,12 @@ class Client {
 						}
 
 						var mentions = [];
-						for (var mention of data.mentions) {
+						for (var mention of info.mentions) {
 							mentions.push(self.addUser(mention));
 						}
 
 						var newMessage = new Message(info, channel, mentions, formerMessage.author);
-						
+
 						self.trigger("messageUpdate", newMessage, formerMessage);
 
 						channel.messages[channel.messages.indexOf(formerMessage)] = newMessage;
@@ -264,6 +264,18 @@ class Client {
 					// all hell to break loose... best to just act as if nothing happened
 					
 					break;
+
+				case "GUILD_DELETE":
+				
+					var server = self.getServer("id", data.id);
+					
+					if(server){
+						self.serverCache.splice(self.serverCache.indexOf(server), 1);
+						self.trigger("serverDelete", server);
+					}
+				
+					break;
+
 				default:
 					self.debug("received unknown packet");
 					self.trigger("unknown", dat);