diff --git a/lib/Client.js b/lib/Client.js
index 15131d074..6f9ffb851 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -529,7 +529,11 @@ var Client = (function () {
 						callback(err);
 						reject(err);
 					} else {
-						self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
+						if (self.getServer("id", res.body.guild.id)) {
+							resolve(self.getServer("id", res.body.guild.id));
+						} else {
+							self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
+						}
 					}
 				});
 			});
@@ -1433,4 +1437,4 @@ function getGateway() {
 	});
 }
 
-module.exports = Client;
+module.exports = Client;
\ No newline at end of file
diff --git a/lib/Endpoints.js b/lib/Endpoints.js
index e55f0f580..271b465eb 100644
--- a/lib/Endpoints.js
+++ b/lib/Endpoints.js
@@ -10,4 +10,4 @@ exports.LOGIN = exports.AUTH + "/login";
 exports.LOGOUT = exports.AUTH + "/logout";
 exports.USERS = exports.API + "/users";
 exports.SERVERS = exports.API + "/guilds";
-exports.CHANNELS = exports.API + "/channels";
+exports.CHANNELS = exports.API + "/channels";
\ No newline at end of file
diff --git a/lib/PMChannel.js b/lib/PMChannel.js
index 232b83d1a..ae44d3d60 100644
--- a/lib/PMChannel.js
+++ b/lib/PMChannel.js
@@ -58,4 +58,4 @@ var PMChannel = (function () {
 	return PMChannel;
 })();
 
-module.exports = PMChannel;
+module.exports = PMChannel;
\ No newline at end of file
diff --git a/lib/channel.js b/lib/channel.js
index f413e03ca..f94925f0c 100644
--- a/lib/channel.js
+++ b/lib/channel.js
@@ -19,7 +19,7 @@ var Channel = (function () {
     _createClass(Channel, [{
         key: "equals",
         value: function equals(object) {
-            return object.id === this.id;
+            return object && object.id === this.id;
         }
     }, {
         key: "addMessage",
@@ -76,4 +76,4 @@ var Channel = (function () {
     return Channel;
 })();
 
-module.exports = Channel;
+module.exports = Channel;
\ No newline at end of file
diff --git a/lib/index.js b/lib/index.js
index f0c3c0ab7..6a2f82f05 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -9,4 +9,4 @@ var Discord = {
 	Client: Client
 };
 
-module.exports = Discord;
+module.exports = Discord;
\ No newline at end of file
diff --git a/lib/internal.js b/lib/internal.js
index e8b3385da..3acf5940b 100644
--- a/lib/internal.js
+++ b/lib/internal.js
@@ -200,4 +200,4 @@ Internal.XHR.setUsername = function (token, avatar, email, newPassword, password
 	});
 };
 
-exports.Internal = Internal;
+exports.Internal = Internal;
\ No newline at end of file
diff --git a/lib/invite.js b/lib/invite.js
index 7bc8204bd..5f51dc1a9 100644
--- a/lib/invite.js
+++ b/lib/invite.js
@@ -32,4 +32,4 @@ var Invite = (function () {
     return Invite;
 })();
 
-module.exports = Invite;
+module.exports = Invite;
\ No newline at end of file
diff --git a/lib/message.js b/lib/message.js
index fed46083a..24c54fbb3 100644
--- a/lib/message.js
+++ b/lib/message.js
@@ -69,4 +69,4 @@ var Message = (function () {
 	return Message;
 })();
 
-module.exports = Message;
+module.exports = Message;
\ No newline at end of file
diff --git a/lib/server.js b/lib/server.js
index 5891d36df..5bf3beca1 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -170,4 +170,4 @@ var Server = (function () {
 	return Server;
 })();
 
-module.exports = Server;
+module.exports = Server;
\ No newline at end of file
diff --git a/lib/user.js b/lib/user.js
index 282d63614..2f363dd1e 100644
--- a/lib/user.js
+++ b/lib/user.js
@@ -53,4 +53,4 @@ var User = (function () {
 	return User;
 })();
 
-module.exports = User;
+module.exports = User;
\ No newline at end of file
diff --git a/src/Client.js b/src/Client.js
index 1993a81dd..21f5caa60 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -542,7 +542,11 @@ class Client {
 						callback(err);
 						reject(err);
 					} else {
-						self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
+						if (self.getServer("id", res.body.guild.id)) {
+							resolve(self.getServer("id", res.body.guild.id));
+						} else {
+							self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
+						}
 					}
 				});
 
diff --git a/src/channel.js b/src/channel.js
index 1f446d074..d32ab580d 100644
--- a/src/channel.js
+++ b/src/channel.js
@@ -14,7 +14,7 @@ class Channel {
     }
 
     equals(object) {
-        return object.id === this.id;
+        return (object && object.id === this.id);
     }
     
     addMessage(data){