diff --git a/SabreTools.Helper/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs
index 9f70ba6e..35c5d2e8 100644
--- a/SabreTools.Helper/Dats/DatFile.cs
+++ b/SabreTools.Helper/Dats/DatFile.cs
@@ -3598,20 +3598,52 @@ namespace SabreTools.Helper.Dats
 				Description = Name + (bare ? "" : " (" + Date + ")");
 			}
 
+			// Make sure the dictionary is defined
+			if (Files == null || Files.Keys.Count == 0)
+			{
+				Files = new SortedDictionary<string, List<DatItem>>();
+			}
+
 			// Process the input
 			if (Directory.Exists(basePath))
 			{
 				logger.Verbose("Folder found: " + basePath);
 
-				// Process the files in all subfolders
-				List<string> files = Directory.EnumerateFiles(basePath, "*", SearchOption.AllDirectories).ToList();
+				// Process the files in the main folder
+				List<string> files = Directory.EnumerateFiles(basePath, "*", SearchOption.TopDirectoryOnly).ToList();
 				Parallel.ForEach(files,
 					new ParallelOptions { MaxDegreeOfParallelism = maxDegreeOfParallelism },
 					item =>
+				{
+					PopulateFromDirCheckFile(item, basePath, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, addBlanks, addDate,
+						tempDir, copyFiles, headerToCheckAgainst, maxDegreeOfParallelism, logger);
+				});
+
+				// Find all top-level subfolders
+				files = Directory.EnumerateDirectories(basePath, "*", SearchOption.TopDirectoryOnly).ToList();
+				Parallel.ForEach(files,
+					new ParallelOptions { MaxDegreeOfParallelism = maxDegreeOfParallelism },
+					item =>
+				{
+					List<string> subfiles = Directory.EnumerateFiles(item, "*", SearchOption.AllDirectories).ToList();
+					Parallel.ForEach(subfiles,
+						new ParallelOptions { MaxDegreeOfParallelism = maxDegreeOfParallelism },
+						subitem =>
 					{
-						PopulateFromDirCheckFile(item, basePath, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, addBlanks, addDate,
+						PopulateFromDirCheckFile(subitem, basePath, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, addBlanks, addDate,
 							tempDir, copyFiles, headerToCheckAgainst, maxDegreeOfParallelism, logger);
 					});
+				});
+
+				// Process the files in all subfolders
+				files = Directory.EnumerateFiles(basePath, "*", SearchOption.AllDirectories).ToList();
+				Parallel.ForEach(files,
+					new ParallelOptions { MaxDegreeOfParallelism = maxDegreeOfParallelism },
+					item =>
+				{
+					PopulateFromDirCheckFile(item, basePath, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, addBlanks, addDate,
+						tempDir, copyFiles, headerToCheckAgainst, maxDegreeOfParallelism, logger);
+				});
 
 				// Now find all folders that are empty, if we are supposed to
 				if (!Romba && addBlanks)
@@ -3721,7 +3753,7 @@ namespace SabreTools.Helper.Dats
 				Rom rom = ArchiveTools.GetTorrentGZFileInfo(item, logger);
 
 				// If the rom is valid, write it out
-				if (rom.Name != null)
+				if (rom != null && rom.Name != null)
 				{
 					// Add the list if it doesn't exist already
 					string key = rom.Size + "-" + rom.CRC;
@@ -3736,7 +3768,6 @@ namespace SabreTools.Helper.Dats
 						Files[key].Add(rom);
 						logger.User("File added: " + Path.GetFileNameWithoutExtension(item) + Environment.NewLine);
 					}
-
 				}
 				else
 				{
diff --git a/SabreTools.Helper/Tools/ArchiveTools.cs b/SabreTools.Helper/Tools/ArchiveTools.cs
index ee9b5745..70c4b3bb 100644
--- a/SabreTools.Helper/Tools/ArchiveTools.cs
+++ b/SabreTools.Helper/Tools/ArchiveTools.cs
@@ -570,20 +570,33 @@ namespace SabreTools.Helper.Tools
 		/// <returns>Populated RomData object if success, empty one on error</returns>
 		public static Rom GetTorrentGZFileInfo(string input, Logger logger)
 		{
+			// Check for the file existing first
+			if (!File.Exists(input))
+			{
+				return null;
+			}
+
 			string datum = Path.GetFileName(input).ToLowerInvariant();
 			long filesize = new FileInfo(input).Length;
 
+			// If we have the romba depot files, just skip them gracefully
+			if (datum == ".romba_size" || datum == ".romba_size.backup")
+			{
+				logger.Verbose("Romba depot file found, skipping: " + input);
+				return null;
+			}
+
 			// Check if the name is the right length
 			if (!Regex.IsMatch(datum, @"^[0-9a-f]{40}\.gz"))
 			{
-				logger.Warning("Non SHA-1 filename found, skipping: '" + datum + "'");
+				logger.Warning("Non SHA-1 filename found, skipping: '" + Path.GetFullPath(input) + "'");
 				return null;
 			}
 
 			// Check if the file is at least the minimum length
 			if (filesize < 40 /* bytes */)
 			{
-				logger.Warning("Possibly corrupt file '" + input + "' with size " + Style.GetBytesReadable(filesize));
+				logger.Warning("Possibly corrupt file '" + Path.GetFullPath(input) + "' with size " + Style.GetBytesReadable(filesize));
 				return null;
 			}