From f6a349953200f3bbd3f85cf1e72c0684e1dc0c5b Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Wed, 6 Dec 2017 14:06:07 -0500
Subject: [PATCH] Fixes Test Merge Manager crashing Control Panel

---
 TGS.ControlPanel/TestMergeManager.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/TGS.ControlPanel/TestMergeManager.cs b/TGS.ControlPanel/TestMergeManager.cs
index ac33d8fff7..76cdf60b2c 100644
--- a/TGS.ControlPanel/TestMergeManager.cs
+++ b/TGS.ControlPanel/TestMergeManager.cs
@@ -282,16 +282,17 @@ namespace TGS.ControlPanel
 				//Merge the PRs, collect errors
 				var errors = await Task.Run(() => repo.MergePullRequests(pulls, false));
 
-				//Show any errors
-				for (var I = 0; I < errors.Count(); ++I)
+				if (errors != null)
 				{
-					var err = errors.ElementAt(I);
-					if (err != null)
-						MessageBox.Show(err, String.Format("Error merging PR #{0}", pulls[I].Number));
-				}
-
-				if (errors.Count() != 0)
+					//Show any errors
+					for (var I = 0; I < errors.Count(); ++I)
+					{
+						var err = errors.ElementAt(I);
+						if (err != null)
+							MessageBox.Show(err, String.Format("Error merging PR #{0}", pulls[I].Number));
+					}
 					return;
+				}
 
 				if (pulls.Count > 0)
 					//regen the changelog