From 17446907b0f86140c8b6af467f345db207df5fba Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 13 Jan 2025 00:31:38 -0500
Subject: [PATCH] Fix RemoveTagsFromChildImpl

---
 SabreTools.DatFiles/DatFile.Splitting.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/SabreTools.DatFiles/DatFile.Splitting.cs b/SabreTools.DatFiles/DatFile.Splitting.cs
index bd34f1d6..0d39c5ae 100644
--- a/SabreTools.DatFiles/DatFile.Splitting.cs
+++ b/SabreTools.DatFiles/DatFile.Splitting.cs
@@ -1142,9 +1142,14 @@ namespace SabreTools.DatFiles
 
                 foreach (DatItem item in items)
                 {
-                    item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.CloneOfKey, null);
-                    item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.RomOfKey, null);
-                    item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.SampleOfKey, null);
+                    // Get the machine
+                    var machine = item.GetFieldValue<Machine>(DatItem.MachineKey);
+                    if (machine == null)
+                        continue;
+                
+                    machine.SetFieldValue<string?>(Models.Metadata.Machine.CloneOfKey, null);
+                    machine.SetFieldValue<string?>(Models.Metadata.Machine.RomOfKey, null);
+                    machine.SetFieldValue<string?>(Models.Metadata.Machine.SampleOfKey, null);
                 }
             }
         }
@@ -1157,6 +1162,7 @@ namespace SabreTools.DatFiles
             var machines = ItemsDB.GetMachines();
             foreach (var machine in machines)
             {
+                // Get the machine
                 if (machine.Value == null)
                     continue;