diff --git a/src/client/actions/Action.js b/src/client/actions/Action.js
index 18be1944c..951f8da06 100644
--- a/src/client/actions/Action.js
+++ b/src/client/actions/Action.js
@@ -93,7 +93,8 @@ class GenericAction {
     if (data.guild_id) {
       const guild = this.client.guilds.cache.get(data.guild_id);
       if (guild) {
-        return this.getMember(data.member, guild).user;
+        const member = this.getMember(data.member, guild);
+        return member ? member.user : undefined;
       }
     }
     return this.getUser(data);
diff --git a/src/client/actions/TypingStart.js b/src/client/actions/TypingStart.js
index b56aff770..7a35bc3f2 100644
--- a/src/client/actions/TypingStart.js
+++ b/src/client/actions/TypingStart.js
@@ -7,6 +7,9 @@ const textBasedChannelTypes = ['dm', 'text', 'news'];
 class TypingStart extends Action {
   handle(data) {
     const channel = this.getChannel(data);
+    if (!channel) {
+      return;
+    }
     if (!textBasedChannelTypes.includes(channel.type)) {
       this.client.emit(Events.WARN, `Discord sent a typing packet to a ${channel.type} channel ${channel.id}`);
       return;