diff --git a/src/Tgstation.Server.Client/ApiClient.cs b/src/Tgstation.Server.Client/ApiClient.cs
index b7df25aa7c..66a2609031 100644
--- a/src/Tgstation.Server.Client/ApiClient.cs
+++ b/src/Tgstation.Server.Client/ApiClient.cs
@@ -164,7 +164,14 @@ namespace Tgstation.Server.Client
 			if (String.IsNullOrWhiteSpace(json))
 				json = JsonConvert.SerializeObject(new object());
 
-			return JsonConvert.DeserializeObject<TResult>(json, serializerSettings);
+			try
+			{
+				return JsonConvert.DeserializeObject<TResult>(json, serializerSettings);
+			}
+			catch (JsonException)
+			{
+				throw new UnrecognizedResponseException(json, response.StatusCode);
+			}
 		}
 
 		/// <inheritdoc />