diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index 8087d50fbd..7cc9cd8364 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -9,6 +9,12 @@
 <p>Step 3 - Select Parts</p>
 <hr>
 
+{% if form_errors %}
+<div class='alert alert-danger alert-block' role='alert'>
+    Errors exist in the submitted data.
+</div>
+{% endif %}
+
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
 
     <button type="submit" class="save btn btn-default">Submit BOM</button>
@@ -39,7 +45,7 @@
         </thead>
         <tbody>
             {% for row in bom_rows %}
-            <tr part-name='{{ row.part_name }}' part-description='{{ row.description }}' part-select='#select_part_{{ row.index }}'>
+            <tr {% if row.errors %} style='background: #ffeaea;'{% endif %} part-name='{{ row.part_name }}' part-description='{{ row.description }}' part-select='#select_part_{{ row.index }}'>
                 <td>
                     <button class='btn btn-default btn-remove' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='Remove row'>
                             <span row_id='{{ forloop.counter }}' onClick='removeRowFromBomWizard()' class='glyphicon glyphicon-small glyphicon-remove'></span>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 086f134e55..eb345105f5 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -848,7 +848,6 @@ class BomUpload(FormView):
             if n_idx >= 0:
                 row['notes'] = row['data'][n_idx]
 
-            row['part'] = part
             row['quantity'] = quantity
             row['part_options'] = [m['part'] for m in matches]
 
@@ -1101,7 +1100,15 @@ class BomUpload(FormView):
 
         self.template_name = 'part/bom_upload/select_parts.html'
 
-        return self.render_to_response(self.get_context_data(form=None))
+        ctx = self.get_context_data(form=None)
+
+        if valid:
+            # Save the BOM data
+            pass
+        else:
+            ctx['form_errors'] = True
+
+        return self.render_to_response(ctx)
 
     def getRowByIndex(self, idx):