From f38fd44547bf8b6b6a18ac65525429dcb35dbaa0 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Wed, 16 Sep 2015 11:18:59 -0300
Subject: [PATCH] Dont crash on GUILD_MEMBER_ADD with a new user

---
 src/Discord.Net/DiscordClient.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index c45ce1e83..75cdec7cb 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -319,6 +319,10 @@ namespace Discord
 					case "GUILD_MEMBER_ADD":
 						{
 							var data = e.Payload.ToObject<Events.GuildMemberAdd>(_serializer);
+							var user = _users.GetOrAdd(data.User.Id);
+							user.Update(data.User);
+							if (_config.TrackActivity)
+								user.UpdateActivity(DateTime.UtcNow);
 							var member = _members.GetOrAdd(data.User.Id, data.GuildId);
 							member.Update(data);
 							RaiseEvent(nameof(MemberAdded), () => RaiseMemberAdded(member));