diff --git a/src/Tgstation.Server.Host/Core/JobHandler.cs b/src/Tgstation.Server.Host/Core/JobHandler.cs
index 72fc7faa40..c57c7bdc1f 100644
--- a/src/Tgstation.Server.Host/Core/JobHandler.cs
+++ b/src/Tgstation.Server.Host/Core/JobHandler.cs
@@ -9,24 +9,25 @@ namespace Tgstation.Server.Host.Core
 	/// </summary>
 	sealed class JobHandler : IDisposable
 	{
-		/// <summary>
-		/// The <see cref="Task"/> being run
-		/// </summary>
-		readonly Task task;
 		/// <summary>
 		/// The <see cref="CancellationTokenSource"/> for <see cref="task"/>
 		/// </summary>
 		readonly CancellationTokenSource cancellationTokenSource;
+		/// <summary>
+		/// The <see cref="Task"/> being run
+		/// </summary>
+		readonly Task task;
 
 		/// <summary>
 		/// Construct a <see cref="JobHandler"/>
 		/// </summary>
-		/// <param name="task">The value of <see cref="Task"/></param>
-		/// <param name="cancellationTokenSource">The value of <see cref="cancellationTokenSource"/></param>
-		JobHandler(Task task, CancellationTokenSource cancellationTokenSource)
+		/// <param name="job">A <see cref="Func{T, TResult}"/> taking a <see cref="CancellationToken"/> and returning a <see cref="Task"/> that the <see cref="JobHandler"/> will wrap</param>
+		public JobHandler(Func<CancellationToken, Task> job)
 		{
-			this.task = task;
-			this.cancellationTokenSource = cancellationTokenSource;
+			if (job == null)
+				throw new ArgumentNullException(nameof(job));
+			cancellationTokenSource = new CancellationTokenSource();
+			task = job(cancellationTokenSource.Token);
 		}
 
 		/// <inehritdoc />
@@ -54,16 +55,5 @@ namespace Tgstation.Server.Host.Core
 		/// Cancels <see cref="task"/>
 		/// </summary>
 		public void Cancel() => cancellationTokenSource.Cancel();
-
-		/// <summary>
-		/// Create a <see cref="JobHandler"/>
-		/// </summary>
-		/// <param name="job">A <see cref="Func{T, TResult}"/> taking a <see cref="CancellationToken"/> and returning a <see cref="Task"/> that the <see cref="JobHandler"/> will wrap</param>
-		/// <returns>A new <see cref="JobHandler"/></returns>
-		public static JobHandler Create(Func<CancellationToken, Task> job)
-		{
-			var cts = new CancellationTokenSource();
-			return new JobHandler(job(cts.Token), cts);
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Tgstation.Server.Host/Core/JobManager.cs b/src/Tgstation.Server.Host/Core/JobManager.cs
index 614661ac0e..b3aeac331d 100644
--- a/src/Tgstation.Server.Host/Core/JobManager.cs
+++ b/src/Tgstation.Server.Host/Core/JobManager.cs
@@ -168,7 +168,7 @@ namespace Tgstation.Server.Host.Core
 
 			await databaseContext.Save(cancellationToken).ConfigureAwait(false);
 			logger.LogDebug("Starting job {0}: {1}...", job.Id, job.Description);
-			var jobHandler = JobHandler.Create(x => RunJob(job, (jobParam, serviceProvider, ct) =>
+			var jobHandler = new JobHandler(x => RunJob(job, (jobParam, serviceProvider, ct) =>
 			operation(jobParam, serviceProvider, y =>
 			{
 				lock (this)