Merge remote-tracking branch 'origin/dev' into unbased

src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs

@@ -205,9 +205,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
 				// retrieve the session controller
 				Server = await serverLaunchTask.ConfigureAwait(false);
 
-				// failed reattaches will return null
-				Server?.SetHighPriority();
-
 				// possiblity of null servers due to failed reattaches
 				if (Server == null)
 				{
@@ -218,6 +215,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
 					return;
 				}
 
+				Server.SetHighPriority();
+
 				await CheckLaunchResult(Server, "Server", cancellationToken).ConfigureAwait(false);
 
 				Server.EnableCustomChatCommands();