diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index 881e5870ca..e3bcb3dd7e 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -91,6 +91,9 @@ src="{% static 'img/blank_image.png' %}"
         <td>
             {% if part.manufacturer %}
             <a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html"%}
+            {% else %}
+            <em>{% trans "No manufacturer information available" %}</em>
+            {% endif %}
             {% endif %}
         </td>
     </tr>
diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index 5471da15cc..930d8260e1 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -87,6 +87,9 @@ src="{% static 'img/blank_image.png' %}"
             <td>{% trans "Supplier" %}</td>
             <td>{% if part.supplier %}
                 <a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a>{% include "clip.html"%}
+                {% else %}
+                <em>{% trans "No supplier information available" %}</em>
+                {% endif %}
                 {% endif %}
             </td>
         </tr>
diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index 7596e8da3a..5302b57e09 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -113,6 +113,9 @@ src="{% static 'img/blank_image.png' %}"
         <td>
             {% if order.supplier %}
             <a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html"%}
+            {% else %}
+            <em>{% trans "No suppplier information available" %}</em>
+            {% endif %}
             {% endif %}
         </td>
     </tr>
diff --git a/InvenTree/report/templates/report/inventree_po_report.html b/InvenTree/report/templates/report/inventree_po_report.html
index 427410576c..9e546fb70e 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>
-        {% if supplier %}{{ supplier.name }}{% endif %}
+        {% if supplier %}{{ supplier.name }}{% endif %}{% else %}{% trans "Supplier was deleted" %}{% endif %}
     </div>
 
 {% endblock %}