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 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);