diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 51e04a2a0..2d90d1399 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -2320,6 +2320,9 @@ var InternalClient = (function () {
 
 					break;
 				case _Constants.PacketType.FRIEND_ADD:
+					if (_this41.user.bot) {
+						return;
+					}
 					if (data.type === 1) {
 						// accepted/got accepted a friend request
 						var inUser = self.incoming_friend_requests.get("id", data.id);
@@ -2348,6 +2351,9 @@ var InternalClient = (function () {
 					}
 					break;
 				case _Constants.PacketType.FRIEND_REMOVE:
+					if (_this41.user.bot) {
+						return;
+					}
 					var user = self.friends.get("id", data.id);
 					if (user) {
 						self.friends.remove(user);
diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index c21590d02..7416c1f35 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -211,7 +211,7 @@ var Resolver = (function () {
 				var user = this.internal.users.get("id", mention.substring(3, mention.length - 1));
 				if (user) {
 					_mentions.push(user);
-					var details = channel.server.detailsOf(user);
+					var details = channel.server && channel.server.detailsOf(user);
 					if (details) {
 						changed = changed.replace(new RegExp(mention, "g"), "@" + (details.nick || user.username + "#" + user.discriminator));
 					}
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 88e6ee8f5..a1310b268 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -2003,6 +2003,9 @@ export default class InternalClient {
 
 					break;
 				case PacketType.FRIEND_ADD:
+					if (this.user.bot) {
+						return;
+					}
 					if (data.type === 1) { // accepted/got accepted a friend request
 						var inUser = self.incoming_friend_requests.get("id", data.id);
 						if (inUser) {
@@ -2030,6 +2033,9 @@ export default class InternalClient {
 					}
 					break;
 				case PacketType.FRIEND_REMOVE:
+					if (this.user.bot) {
+						return;
+					}
 					var user = self.friends.get("id", data.id);
 					if (user) {
 						self.friends.remove(user);
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index 9bb9da4fa..36c0be42c 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -140,7 +140,7 @@ export default class Resolver {
 				var user = this.internal.users.get("id", mention.substring(3, mention.length - 1));
 				if (user) {
 					_mentions.push(user);
-					var details = channel.server.detailsOf(user);
+					var details = channel.server && channel.server.detailsOf(user);
 					if (details) {
 						changed = changed.replace(new RegExp(mention, "g"), `@${details.nick || (user.username + "#" + user.discriminator)}`);
 					}