diff --git a/SabreTools.Helper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs
index 16e8da6e..2f40a286 100644
--- a/SabreTools.Helper/Tools/DatTools.cs
+++ b/SabreTools.Helper/Tools/DatTools.cs
@@ -1035,13 +1035,14 @@ namespace SabreTools.Helper
 									tempname = String.Join("\\", parent) + "\\" + tempname;
 								}
 
-								while (software || subreader.Read())
+								while (software || !subreader.EOF)
 								{
 									software = false;
 
 									// We only want elements
 									if (subreader.NodeType != XmlNodeType.Element)
 									{
+										subreader.Read();
 										continue;
 									}
 
@@ -1178,6 +1179,10 @@ namespace SabreTools.Helper
 											{
 												logger.Log("Rom was not added: '" + xtr.GetAttribute("name") + "'");
 											}
+											subreader.Read();
+											break;
+										default:
+											subreader.Read();
 											break;
 									}
 								}