diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index fb33128a77..884faffc8f 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -90,7 +90,11 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-industry'></span></td>
         <td>{% trans "Manufacturer" %}</td>
-        <td><a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html"%}</td>
+        <td>
+            {% if part.manufacturer %}
+            <a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html"%}
+            {% endif %}
+        </td>
     </tr>
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
@@ -324,7 +328,9 @@ $('#delete-part').click(function() {
 
     deleteManufacturerPart({{ part.pk }}, {
         onSuccess: function() {
+            {% if part.manufacturer %}
             window.location.href = "{% url 'company-detail' part.manufacturer.id %}";
+            {% endif %}
         }
     });
 });
diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index 67902dc6f6..e7d9633bba 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -85,7 +85,11 @@ src="{% static 'img/blank_image.png' %}"
         <tr>
             <td><span class='fas fa-building'></span></td>
             <td>{% trans "Supplier" %}</td>
-            <td><a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a>{% include "clip.html"%}</td></tr>
+            <td>{% if part.supplier %}
+                <a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a>{% include "clip.html"%}
+                {% endif %}
+            </td>
+        </tr>
         <tr>
             <td><span class='fas fa-hashtag'></span></td>
             <td>{% trans "SKU" %}</td>
@@ -350,7 +354,9 @@ $('#delete-part').click(function() {
 
     deleteSupplierPart({{ part.pk }}, {
         onSuccess: function() {
+            {% if part.supplier %}
             window.location.href = "{% url 'company-detail' part.supplier.id %}";
+            {% endif %}
         }
     });
 });
diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index c2aa10f722..7596e8da3a 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -67,7 +67,7 @@
 
 {% block thumbnail %}
 <img class='part-thumb'
-{% if order.supplier.image %}
+{% if order.supplier and order.supplier.image %}
 src="{{ order.supplier.image.url }}"
 {% else %}
 src="{% static 'img/blank_image.png' %}"
@@ -110,7 +110,11 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Supplier" %}</td>
-        <td><a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html"%}</td>
+        <td>
+            {% if order.supplier %}
+            <a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html"%}
+            {% endif %}
+        </td>
     </tr>
     {% if order.supplier_reference %}
     <tr>
diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html
index 6ef2f6c910..2aae7a42ac 100644
--- a/InvenTree/order/templates/order/order_wizard/select_pos.html
+++ b/InvenTree/order/templates/order/order_wizard/select_pos.html
@@ -32,6 +32,7 @@
             <th colspan='2'>{% trans "Select Purchase Order" %}</th>
         </tr>
         {% for supplier in suppliers %}
+        {% if supplier %}
         <tr id='suppier_row_{{ supplier.id }}'>
             <td>
                 {% include 'hover_image.html' with image=supplier.image hover=False %}
@@ -70,6 +71,7 @@
                 </div>
             </td>
         </tr>
+        {% endif %}
         {% endfor %}
 
     </table>
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 23bdd908e1..542a7a90ca 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -170,10 +170,12 @@ $('#new-po-line').click(function() {
 
     var fields = poLineItemFields({
         order: {{ order.pk }},
+        {% if order.supplier %}
         supplier: {{ order.supplier.pk }},
         {% if order.supplier.currency %}
         currency: '{{ order.supplier.currency }}',
         {% endif %}
+        {% endif %}
     });
 
     constructForm('{% url "api-po-line-list" %}', {
@@ -210,7 +212,9 @@ $('#new-po-line').click(function() {
 
 loadPurchaseOrderLineItemTable('#po-line-table', {
     order: {{ order.pk }},
+    {% if order.supplier %}
     supplier: {{ order.supplier.pk }},
+    {% endif %}
     {% if roles.purchase_order.change %}
     allow_edit: true,
     {% else %}
diff --git a/InvenTree/part/templates/part/partial_delete.html b/InvenTree/part/templates/part/partial_delete.html
index eb23fbee09..22c739b833 100644
--- a/InvenTree/part/templates/part/partial_delete.html
+++ b/InvenTree/part/templates/part/partial_delete.html
@@ -43,7 +43,7 @@
 <p>{% blocktrans with count=part.manufacturer_parts.all|length %}There are {{count}} manufacturers defined for this part. If you delete this part, the following manufacturer parts will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for spart in part.manufacturer_parts.all %}
-        <li class='list-group-item'>{{ spart.manufacturer.name }} - {{ spart.MPN }}</li>
+        <li class='list-group-item'>{% if spart.manufacturer %}{{ spart.manufacturer.name }} - {% endif %}{{ spart.MPN }}</li>
         {% endfor %}
     </ul>
 </p>
@@ -54,7 +54,9 @@
 <p>{% blocktrans with count=part.supplier_parts.all|length %}There are {{count}} suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for spart in part.supplier_parts.all %}
+        {% if spart.supplier %}
         <li class='list-group-item'>{{ spart.supplier.name }} - {{ spart.SKU }}</li>
+        {% endif %}
         {% endfor %}
     </ul>
 </p>
diff --git a/InvenTree/report/templates/report/inventree_po_report.html b/InvenTree/report/templates/report/inventree_po_report.html
index d1cae75c3b..427410576c 100644
--- a/InvenTree/report/templates/report/inventree_po_report.html
+++ b/InvenTree/report/templates/report/inventree_po_report.html
@@ -74,7 +74,7 @@ table td.expand {
 
     <div class='header-right'>
         <h3>{% trans "Purchase Order" %} {{ prefix }}{{ reference }}</h3>
-        {{ supplier.name }}
+        {% if supplier %}{{ supplier.name }}{% endif %}
     </div>
 
 {% endblock %}
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index dd77d26d1c..4c8af402cf 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -379,7 +379,11 @@
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Supplier" %}</td>
-        <td><a href="{% url 'company-detail' item.supplier_part.supplier.id %}">{{ item.supplier_part.supplier.name }}</a></td>
+        <td>
+            {% if item.supplier_part.supplier %}
+            <a href="{% url 'company-detail' item.supplier_part.supplier.id %}">{{ item.supplier_part.supplier.name }}</a>
+            {% endif %}
+        </td>
     </tr>
     <tr>
         <td><span class='fas fa-shapes'></span></td>