diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs
index e49647a..737e421 100644
--- a/Helper/StaticHelper.cs
+++ b/Helper/StaticHelper.cs
@@ -176,8 +176,12 @@ namespace CarCareTracker.Helper
             var fieldNames = templateExtraFields.Select(x => x.Name);
             //remove fields that are no longer present in template.
             recordExtraFields.RemoveAll(x => !fieldNames.Contains(x.Name));
+            if (!recordExtraFields.Any())
+            {
+                return templateExtraFields;
+            }
             //append the fields.
-            foreach(ExtraField extraField in recordExtraFields)
+            foreach (ExtraField extraField in recordExtraFields)
             {
                 extraField.IsRequired = templateExtraFields.Where(x => x.Name == extraField.Name).First().IsRequired;
             }