diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 2cc959fd1..5d2eb2daa 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -2216,8 +2216,6 @@ var InternalClient = (function () {
 					}
 				} else if (!server) {
 					client.emit("warn", "server was updated but it was not in the cache");
-					this.servers.add(new _StructuresServer2["default"](data, client));
-					client.emit("serverCreated", server);
 				}
 				break;
 			case _Constants.PacketType.CHANNEL_CREATE:
diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index 7416c1f35..d875a87bc 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -362,7 +362,7 @@ var Resolver = (function () {
 
 				var pmchat = _ref5;
 
-				if (pmchat.recipient.equals(resource)) {
+				if (pmchat.recipients.length === 1 && pmchat.recipient && pmchat.recipient.equals(resource)) {
 					return Promise.resolve(pmchat);
 				}
 			}
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index f4ae12bbe..7970863e6 100755
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1941,8 +1941,6 @@ export default class InternalClient {
 					}
 				} else if (!server) {
 					client.emit("warn", "server was updated but it was not in the cache");
-					this.servers.add(new Server(data, client));
-					client.emit("serverCreated", server);
 				}
 				break;
 			case PacketType.CHANNEL_CREATE:
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index 36c0be42c..aa7495ac1 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -252,7 +252,7 @@ export default class Resolver {
 		if (resource instanceof User) {
 			// see if a PM exists
 			for (var pmchat of this.internal.private_channels) {
-				if (pmchat.recipient.equals(resource)) {
+				if (pmchat.recipients.length === 1 && pmchat.recipient && pmchat.recipient.equals(resource)) {
 					return Promise.resolve(pmchat);
 				}
 			}