From eeac71b5902a2b996e8eac60fa9093cc2204f5a7 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 11 May 2020 23:03:20 -0400
Subject: [PATCH] Fix potential NullReferenceException

---
 .../Components/Watchdog/SessionControllerFactory.cs          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
index 3832ba7c34..b55a226a6a 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
@@ -356,9 +356,10 @@ namespace Tgstation.Server.Host.Components.Watchdog
 			var testMerges = dmbProvider
 				.CompileJob
 				.RevisionInformation
-				.ActiveTestMerges
+				.ActiveTestMerges?
 				.Select(x => x.TestMerge)
-				.Select(x => new TestMergeInformation(x, revisionInfo));
+				.Select(x => new TestMergeInformation(x, revisionInfo))
+				?? Enumerable.Empty<TestMergeInformation>();
 
 			return new RuntimeInformation(
 				assemblyInformationProvider,