diff --git a/SabreHelper/DatTools/RomManipulation.cs b/SabreHelper/DatTools/RomManipulation.cs index 8858f8a7..105b9834 100644 --- a/SabreHelper/DatTools/RomManipulation.cs +++ b/SabreHelper/DatTools/RomManipulation.cs @@ -19,7 +19,7 @@ namespace SabreTools.Helper { try { - StreamReader sr = new StreamReader(File.OpenRead(filename)); + StreamReader sr = File.OpenText(filename); string first = sr.ReadLine(); sr.Close(); if (first.Contains("<") && first.Contains(">")) @@ -1426,6 +1426,13 @@ namespace SabreTools.Helper /// A List of RomData objects representing the merged roms public static List Merge(List inroms, Logger logger) { + // Check for null or blank roms first + if (inroms == null || inroms.Count == 0) + { + return new List(); + } + + // Create output list List outroms = new List(); // First sort the roms by size, crc, md5, sha1 (in order)