diff --git a/src/backend/InvenTree/build/models.py b/src/backend/InvenTree/build/models.py
index 326e484137..2ad57b9f62 100644
--- a/src/backend/InvenTree/build/models.py
+++ b/src/backend/InvenTree/build/models.py
@@ -120,26 +120,28 @@ class Build(
         self.validate_reference_field(self.reference)
         self.reference_int = self.rebuild_reference_field(self.reference)
 
-        if get_global_setting('BUILDORDER_REQUIRE_VALID_BOM'):
-            # Check that the BOM is valid
-            if not self.part.is_bom_valid():
-                raise ValidationError({
-                    'part': _('Assembly BOM has not been validated')
-                })
+        # Check part when initially creating the build order
+        if not self.pk or self.has_field_changed('part'):
+            if get_global_setting('BUILDORDER_REQUIRE_VALID_BOM'):
+                # Check that the BOM is valid
+                if not self.part.is_bom_valid():
+                    raise ValidationError({
+                        'part': _('Assembly BOM has not been validated')
+                    })
 
-        if get_global_setting('BUILDORDER_REQUIRE_ACTIVE_PART'):
-            # Check that the part is active
-            if not self.part.active:
-                raise ValidationError({
-                    'part': _('Build order cannot be created for an inactive part')
-                })
+            if get_global_setting('BUILDORDER_REQUIRE_ACTIVE_PART'):
+                # Check that the part is active
+                if not self.part.active:
+                    raise ValidationError({
+                        'part': _('Build order cannot be created for an inactive part')
+                    })
 
-        if get_global_setting('BUILDORDER_REQUIRE_LOCKED_PART'):
-            # Check that the part is locked
-            if not self.part.locked:
-                raise ValidationError({
-                    'part': _('Build order cannot be created for an unlocked part')
-                })
+            if get_global_setting('BUILDORDER_REQUIRE_LOCKED_PART'):
+                # Check that the part is locked
+                if not self.part.locked:
+                    raise ValidationError({
+                        'part': _('Build order cannot be created for an unlocked part')
+                    })
 
         # On first save (i.e. creation), run some extra checks
         if self.pk is None:
diff --git a/src/backend/InvenTree/templates/js/translated/forms.js b/src/backend/InvenTree/templates/js/translated/forms.js
index 7d273dd9ec..3d888072eb 100644
--- a/src/backend/InvenTree/templates/js/translated/forms.js
+++ b/src/backend/InvenTree/templates/js/translated/forms.js
@@ -1502,8 +1502,23 @@ function handleFormErrors(errors, fields={}, options={}) {
 
     for (var field_name in errors) {
 
-        var field = fields[field_name] || {};
-        var field_errors = errors[field_name];
+        let field = fields[field_name] || null;
+        let field_errors = errors[field_name];
+
+        // No matching field - append to non_field_errors
+        if (!field || field.hidden) {
+
+            if (Array.isArray(field_errors)) {
+                field_errors.forEach((err) => {
+                    non_field_errors.append(`<div class='alert alert-block alert-danger'>${err}</div>`);
+                });
+            } else {
+                non_field_errors.append(`<div class='alert alert-block alert-danger'>${field_errors.toString()}</div>`);
+            }
+
+            continue;
+        }
+
 
         // for nested objects with children and dependent fields with a child defined, extract nested errors
         if (((field.type == 'nested object') && ('children' in field)) || ((field.type == 'dependent field') && ('child' in field))) {