From 5c34427c81ae5c3e64cc8b788891be6b90cb9949 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 20 Sep 2016 14:01:32 -0700
Subject: [PATCH] [DatFile] Add safeguard for issues I haven't been able to
 locally verify

---
 SabreTools.Helper/Objects/Dat/DatFile.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/SabreTools.Helper/Objects/Dat/DatFile.cs b/SabreTools.Helper/Objects/Dat/DatFile.cs
index e6b72268..46cc5ca4 100644
--- a/SabreTools.Helper/Objects/Dat/DatFile.cs
+++ b/SabreTools.Helper/Objects/Dat/DatFile.cs
@@ -2249,6 +2249,14 @@ namespace SabreTools.Helper
 			foreach (string key in dict.Keys)
 			{
 				List<DatItem> roms = dict[key];
+
+				// If we somehow have a null list, just skip it
+				if (roms == null)
+				{
+					logger.Warning("Blank list found for key: " + key);
+					continue;
+				}
+
 				if (mergeroms)
 				{
 					roms = DatItem.Merge(roms, logger);