diff --git a/SS14.Launcher/ConfigConstants.cs b/SS14.Launcher/ConfigConstants.cs
index 40852ef5b..18da700fe 100644
--- a/SS14.Launcher/ConfigConstants.cs
+++ b/SS14.Launcher/ConfigConstants.cs
@@ -11,7 +11,7 @@ public static class ConfigConstants
     // Refresh login tokens if they're within <this much> of expiry.
     public static readonly TimeSpan TokenRefreshThreshold = TimeSpan.FromDays(15);
 
-    // If the user leaves the launcher running for absolute ages, this is how often we'll update his login tokens.
+    // If the user leaves the launcher running for absolute ages, this is how often we'll update their login tokens.
     public static readonly TimeSpan TokenRefreshInterval = TimeSpan.FromDays(7);
 
     // The amount of time before a server is considered timed out for status checks.
diff --git a/SS14.Launcher/Models/Logins/LoginManager.cs b/SS14.Launcher/Models/Logins/LoginManager.cs
index 963c5b52a..080aebd3f 100644
--- a/SS14.Launcher/Models/Logins/LoginManager.cs
+++ b/SS14.Launcher/Models/Logins/LoginManager.cs
@@ -86,7 +86,7 @@ public LoginManager(DataManager cfg, AuthApi authApi)
     public async Task Initialize()
     {
         // Set up timer so that if the user leaves their launcher open for a month or something
-        // his tokens don't expire.
+        // their tokens don't expire.
         _timer = DispatcherTimer.Run(() =>
         {
             async void Impl()
diff --git a/SS14.Launcher/Utility/UrlFallbackSet.cs b/SS14.Launcher/Utility/UrlFallbackSet.cs
index 4734aed2f..38523ebd0 100644
--- a/SS14.Launcher/Utility/UrlFallbackSet.cs
+++ b/SS14.Launcher/Utility/UrlFallbackSet.cs
@@ -109,6 +109,9 @@ private static async Task<HttpResponseMessage> AttemptConnection(
             cancel
         ).ConfigureAwait(false);
 
+        if ((int)response.StatusCode >= 500)
+            throw new HttpRequestException($"Server returned {response.StatusCode} for {message.RequestUri}");
+
         return response;
     }