diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index 05891c66dc..67d1b83eb0 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -63,7 +63,10 @@
                     </select>
                     <i>{{ item.cell }}</i>
                     {% elif item.column.guess == 'Quantity' %}
-                    <input class='numberinput' type='number' min='1' value='{{ row.quantity }}'/>
+                    <input name='quantity_{{ row.index }}' class='numberinput' type='number' min='1' value='{{ row.quantity }}'/>
+                    {% if row.errors.quantity %}
+                    <p class='help-block'>{{ row.errors.quantity }}</p>
+                    {% endif %}
                     {% elif item.column.guess == 'Reference' %}
                     <input name='reference_{{ row.index }}' value='{{ row.reference }}'/>
                     {% elif item.column.guess == 'Notes' %}
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index af0e75aac2..6afb8f1eea 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -711,6 +711,7 @@ class BomUpload(FormView):
                 'part': row.get('part', None),
                 'reference': row.get('reference', ''),
                 'notes': row.get('notes', ''),
+                'errors': row.get('errors', ''),
             })
 
         ctx['part'] = self.part
@@ -941,7 +942,11 @@ class BomUpload(FormView):
                 value = row[col_idx]
                 items.append(value)
 
-            self.bom_rows.append({'index': row_idx, 'data': items})
+            self.bom_rows.append({
+                'index': row_idx,
+                'data': items,
+                'errors': {},
+            })
 
         # Construct the column data
         self.bom_columns = []
@@ -1002,13 +1007,53 @@ class BomUpload(FormView):
 
     def handlePartSelection(self):
         
-        # Extract POST data
+        # Extract basic table data from POST request
         self.getTableDataFromPost()
 
+        # Keep track of the parts that have been selected
+        parts = {}
+
+        # Extract other data (part selections, etc)
+        for key in self.request.POST:
+            value = self.request.POST[key]
+
+            # Extract quantity from each row
+            if key.startswith('quantity_'):
+                try:
+                    row_id = int(key.replace('quantity_', ''))
+
+                    row = self.getRowByIndex(row_id)
+
+                    if row is None:
+                        print("No match found for row", row_id)
+                        continue
+
+                    q = 1
+
+                    try:
+                        q = int(value)
+                        if q <= 0:
+                            row['errors']['quantity'] = _('Quantity must be greater than zero')
+                    except ValueError:
+                        row['errors']['quantity'] = _('Enter a valid quantity')
+
+                    row['quantity'] = q
+                     
+                except ValueError:
+                    continue
+
         self.template_name = 'part/bom_upload/select_parts.html'
 
         return self.render_to_response(self.get_context_data(form=None))
 
+    def getRowByIndex(self, idx):
+        
+        for row in self.bom_rows:
+            if row['index'] == idx:
+                return row
+
+        return None
+
     def post(self, request, *args, **kwargs):
         """ Perform the various 'POST' requests required.
         """