diff --git a/RecodeItLib/Remapper/RenameHelper.cs b/RecodeItLib/Remapper/RenameHelper.cs
index 4d90e40..9f7f473 100644
--- a/RecodeItLib/Remapper/RenameHelper.cs
+++ b/RecodeItLib/Remapper/RenameHelper.cs
@@ -19,6 +19,12 @@ internal static class RenameHelper
         // Rename all fields and properties first
         if (DataProvider.Settings.Remapper.MappingSettings.RenameFields)
         {
+            if (remap.TypePrimeCandidate == null)
+            {
+                Logger.Log($"Unable to rename {remap.NewTypeName} as TypePrimeCandidate value is null/empty, skipping", ConsoleColor.Red);
+                return;
+            }
+
             RenameAllFields(
                 remap.TypePrimeCandidate.Name.String,
                 remap.NewTypeName,