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(DatItem.MachineKey)!.SetFieldValue(Models.Metadata.Machine.CloneOfKey, null); - item.GetFieldValue(DatItem.MachineKey)!.SetFieldValue(Models.Metadata.Machine.RomOfKey, null); - item.GetFieldValue(DatItem.MachineKey)!.SetFieldValue(Models.Metadata.Machine.SampleOfKey, null); + // Get the machine + var machine = item.GetFieldValue(DatItem.MachineKey); + if (machine == null) + continue; + + machine.SetFieldValue(Models.Metadata.Machine.CloneOfKey, null); + machine.SetFieldValue(Models.Metadata.Machine.RomOfKey, null); + machine.SetFieldValue(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;