From f44afd61964a389e7ea56ad28fe34734e4299cf7 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sun, 25 Oct 2015 06:25:49 -0300
Subject: [PATCH] Made GetX methods more consistent

---
 src/Discord.Net/DiscordClient.Channels.cs | 2 ++
 src/Discord.Net/DiscordClient.Messages.cs | 8 +++++++-
 src/Discord.Net/DiscordClient.Servers.cs  | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.Channels.cs b/src/Discord.Net/DiscordClient.Channels.cs
index 8726576e2..86b87c9dd 100644
--- a/src/Discord.Net/DiscordClient.Channels.cs
+++ b/src/Discord.Net/DiscordClient.Channels.cs
@@ -51,6 +51,8 @@ namespace Discord
 		public Channel GetChannel(string id)
 		{
 			if (id == null) throw new ArgumentNullException(nameof(id));
+			CheckReady();
+
 			return _channels[id];
 		}
 		
diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs
index 8a6780b52..a9d91b521 100644
--- a/src/Discord.Net/DiscordClient.Messages.cs
+++ b/src/Discord.Net/DiscordClient.Messages.cs
@@ -80,7 +80,13 @@ namespace Discord
 		private readonly Messages _messages;
 
 		/// <summary> Returns the message with the specified id, or null if none was found. </summary>
-		public Message GetMessage(string id) => _messages[id];
+		public Message GetMessage(string id)
+		{
+			if (id == null) throw new ArgumentNullException(nameof(id));
+			CheckReady();
+
+			return _messages[id];
+		}
 
 		/// <summary> Sends a message to the provided channel. To include a mention, see the Mention static helper class. </summary>
 		public Task<Message> SendMessage(Channel channel, string text)
diff --git a/src/Discord.Net/DiscordClient.Servers.cs b/src/Discord.Net/DiscordClient.Servers.cs
index b454bdefc..472b43771 100644
--- a/src/Discord.Net/DiscordClient.Servers.cs
+++ b/src/Discord.Net/DiscordClient.Servers.cs
@@ -62,7 +62,13 @@ namespace Discord
 		private readonly Servers _servers;
 
 		/// <summary> Returns the server with the specified id, or null if none was found. </summary>
-		public Server GetServer(string id) => _servers[id];
+		public Server GetServer(string id)
+		{
+			if (id == null) throw new ArgumentNullException(nameof(id));
+			CheckReady();
+
+			return _servers[id];
+		}
 
 		/// <summary> Returns all servers with the specified name. </summary>
 		/// <remarks> Search is case-insensitive. </remarks>