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
}
/// Returns a collection of all servers this client is a member of.
- public IEnumerable PrivateChannels => _channels.PrivateChannels;
+ public IEnumerable 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
}
/// Returns a collection of all servers this client is a member of.
- public IEnumerable AllServers => _servers;
+ public IEnumerable 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;
/// Returns information about the currently logged-in account.
- public GlobalUser CurrentUser => _privateUser.Global;
+ public GlobalUser CurrentUser { get { CheckReady(); return _privateUser.Global; } }
/// Returns a collection of all unique users this client can currently see.
- public IEnumerable AllUsers => _globalUsers;
+ public IEnumerable 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];
}
/// Returns the user with the specified id, along with their server-specific data, or null if none was found.