diff --git a/TGS.CommandLine/Program.cs b/TGS.CommandLine/Program.cs
index 369652de33..40e2ae456b 100644
--- a/TGS.CommandLine/Program.cs
+++ b/TGS.CommandLine/Program.cs
@@ -243,6 +243,7 @@ namespace TGS.CommandLine
 						else
 						{
 							Console.WriteLine("Connected remotely");
+							Console.WriteLine("Type 'instance' to connect to a server instance");
 							if (currentInterface.VersionMismatch(out error))
 							{
 								SentVMMWarning = true;
diff --git a/TGS.CommandLine/RootCommands.cs b/TGS.CommandLine/RootCommands.cs
index 0de21674cd..309ebca351 100644
--- a/TGS.CommandLine/RootCommands.cs
+++ b/TGS.CommandLine/RootCommands.cs
@@ -8,14 +8,13 @@ namespace TGS.CommandLine
 	{
 		public CLICommand(IClient I)
 		{
-			var tmp = new List<Command> { new UpdateCommand(), new TestmergeCommand(), new RepoCommand(), new BYONDCommand(), new DMCommand(), new DDCommand(), new ConfigCommand(), new IRCCommand(), new DiscordCommand(), new AutoUpdateCommand(), new SetAutoUpdateCommand() };
-			if (ConsoleCommand.Instance.Administration != null)
+			var tmp = ConsoleCommand.Instance != null ? new List<Command> { new UpdateCommand(), new TestmergeCommand(), new RepoCommand(), new BYONDCommand(), new DMCommand(), new DDCommand(), new ConfigCommand(), new IRCCommand(), new DiscordCommand(), new AutoUpdateCommand(), new SetAutoUpdateCommand() } : new List<Command>();
+			if (ConsoleCommand.Instance?.Administration != null)
 				tmp.Add(new AdminCommand());
 			if (ConsoleCommand.Server.Management != null)
 				tmp.Add(new ServiceCommand());
 			Children = tmp.ToArray();
 		}
-
 		public override void PrintHelp()
 		{
 			OutputProc("/tg/station 13 Server Command Line");