From de7c3b31c70693900251ff4b9df6bd060f6faa3b Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:41:59 -0500
Subject: [PATCH 1/2] Adds additional null checking

Likely fixes #1127
---
 src/Tgstation.Server.Host/Controllers/RepositoryController.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
index 88de87bbce..880a8efc96 100644
--- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
+++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
@@ -744,6 +744,9 @@ namespace Tgstation.Server.Host.Controllers
 											revInfoWereLookingFor = dbPull
 												.Where(testRevInfo =>
 												{
+													if (testRevInfo.PrimaryTestMerge == null)
+														return false;
+
 													var testMergeMatch = model.NewTestMerges.Any(testTestMerge =>
 													{
 														var numberMatch = testRevInfo.PrimaryTestMerge.Number == testTestMerge.Number;

From 88b16e1323bf788127c2f17ce15bd2ea19f9c03f Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:43:25 -0500
Subject: [PATCH 2/2] Version bump to 4.6.1

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index 3b64b3ff67..306f7948c9 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>4.6.0</TgsCoreVersion>
+    <TgsCoreVersion>4.6.1</TgsCoreVersion>
     <TgsConfigVersion>2.1.1</TgsConfigVersion>
     <TgsApiVersion>7.4.0</TgsApiVersion>
     <TgsClientVersion>8.4.0</TgsClientVersion>