diff --git a/InvenTree/static/script/inventree/stock.js b/InvenTree/static/script/inventree/stock.js
index 91aec8c6d1..a858dca122 100644
--- a/InvenTree/static/script/inventree/stock.js
+++ b/InvenTree/static/script/inventree/stock.js
@@ -65,7 +65,12 @@ function updateStock(items, options={}) {
         html += '<tr>';
 
         html += '<td>' + item.part.name + '</td>';
-        html += '<td>' + item.location.name + '</td>';
+
+        if (item.location) {
+            html += '<td>' + item.location.name + '</td>';
+        } else {
+            html += '<td><i>No location set</i></td>';
+        }
         html += "<td><input class='form-control' ";
         html += "value='" + vCur + "' ";
         html += "min='" + vMin + "' ";