From 736e5ed26829b4a5e87e9901150ede4caf9bd23d Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 1 Dec 2015 14:55:13 -0400
Subject: [PATCH] Added status checks to a several properties of DiscordClient.

---
 src/Discord.Net/DiscordClient.Channels.cs | 2 +-
 src/Discord.Net/DiscordClient.Servers.cs  | 2 +-
 src/Discord.Net/DiscordClient.Users.cs    | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.Channels.cs b/src/Discord.Net/DiscordClient.Channels.cs
index fb7c769a6..9a7cc6f78 100644
--- a/src/Discord.Net/DiscordClient.Channels.cs
+++ b/src/Discord.Net/DiscordClient.Channels.cs
@@ -66,7 +66,7 @@ namespace Discord
 		}
 
 		/// <summary> Returns a collection of all servers this client is a member of. </summary>
-		public IEnumerable<Channel> PrivateChannels => _channels.PrivateChannels;
+		public IEnumerable<Channel> PrivateChannels { get { CheckReady(); return _channels.PrivateChannels; } }
 		internal Channels Channels => _channels;
 		private readonly Channels _channels;
 
diff --git a/src/Discord.Net/DiscordClient.Servers.cs b/src/Discord.Net/DiscordClient.Servers.cs
index b52901fa0..af81ab07b 100644
--- a/src/Discord.Net/DiscordClient.Servers.cs
+++ b/src/Discord.Net/DiscordClient.Servers.cs
@@ -56,7 +56,7 @@ namespace Discord
 		}
 
 		/// <summary> Returns a collection of all servers this client is a member of. </summary>
-		public IEnumerable<Server> AllServers => _servers;
+		public IEnumerable<Server> AllServers { get { CheckReady(); return _servers; } }
 		internal Servers Servers => _servers;
 		private readonly Servers _servers;
 
diff --git a/src/Discord.Net/DiscordClient.Users.cs b/src/Discord.Net/DiscordClient.Users.cs
index c84aeaf00..67fe28a07 100644
--- a/src/Discord.Net/DiscordClient.Users.cs
+++ b/src/Discord.Net/DiscordClient.Users.cs
@@ -134,10 +134,10 @@ namespace Discord
 		private User _privateUser;
 
 		/// <summary> Returns information about the currently logged-in account. </summary>
-		public GlobalUser CurrentUser => _privateUser.Global;
+		public GlobalUser CurrentUser { get { CheckReady(); return _privateUser.Global; } }
 
 		/// <summary> Returns a collection of all unique users this client can currently see. </summary>
-		public IEnumerable<GlobalUser> AllUsers => _globalUsers;
+		public IEnumerable<GlobalUser> AllUsers { get { CheckReady(); return _globalUsers; } }
 		internal GlobalUsers GlobalUsers => _globalUsers;
 		private readonly GlobalUsers _globalUsers;
 
@@ -146,6 +146,9 @@ namespace Discord
 
 		public GlobalUser GetUser(long userId)
 		{
+			if (userId <= 0) throw new ArgumentOutOfRangeException(nameof(userId));
+			CheckReady();
+
 			return _globalUsers[userId];
 		}
 		/// <summary> Returns the user with the specified id, along with their server-specific data, or null if none was found. </summary>