diff --git a/src/Discord.Net.Commands/CommandsPlugin.Events.cs b/src/Discord.Net.Commands/CommandsPlugin.Events.cs
index 0af8d2b52..7092e10ef 100644
--- a/src/Discord.Net.Commands/CommandsPlugin.Events.cs
+++ b/src/Discord.Net.Commands/CommandsPlugin.Events.cs
@@ -13,6 +13,7 @@ namespace Discord.Commands
 
 		public User User => Message.User;
 		public string UserId => Message.UserId;
+		public Member Member => Message.Member;
 		public Channel Channel => Message.Channel;
 		public string ChannelId => Message.ChannelId;
 		public Server Server => Message.Channel.Server;
diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs
index d0f60313b..80e06a973 100644
--- a/src/Discord.Net/Models/Server.cs
+++ b/src/Discord.Net/Models/Server.cs
@@ -140,8 +140,8 @@ namespace Discord
 			foreach (var subModel in model.Members)
 			{
 				var user = users.GetOrAdd(subModel.User.Id);
-				var member = members.GetOrAdd(subModel.User.Id, Id);
 				user.Update(subModel.User);
+				var member = members.GetOrAdd(subModel.User.Id, Id);
 				member.Update(subModel);
 			}
 			foreach (var subModel in model.VoiceStates)