From 24477a8012bbeea16e2d14e151c025bdf8566166 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Mon, 20 Aug 2018 11:26:35 -0400
Subject: [PATCH] Fix API conflict exception not passing an ErrorMessage

---
 src/Tgstation.Server.Client/ApiConflictException.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Client/ApiConflictException.cs b/src/Tgstation.Server.Client/ApiConflictException.cs
index ba3eaa90c6..189fd92009 100644
--- a/src/Tgstation.Server.Client/ApiConflictException.cs
+++ b/src/Tgstation.Server.Client/ApiConflictException.cs
@@ -14,7 +14,11 @@ namespace Tgstation.Server.Client
 		/// </summary>
 		/// <param name="errorMessage">The <see cref="ErrorMessage"/> for the <see cref="ClientException"/></param>
 		/// <param name="statusCode">The <see cref="HttpStatusCode"/> for the <see cref="ClientException"/></param>
-		public ApiConflictException(ErrorMessage errorMessage, HttpStatusCode statusCode) : base(errorMessage, statusCode) { }
+		public ApiConflictException(ErrorMessage errorMessage, HttpStatusCode statusCode) : base(errorMessage ?? new ErrorMessage
+		{
+			Message = "An unknown API error occurred!",
+			SeverApiVersion = null
+		}, statusCode) { }
 
 		/// <summary>
 		/// Construct an <see cref="ApiConflictException"/>