diff --git a/app/overrides/spree/admin/shared/_order_tabs/add_customer_name.html.haml.deface b/app/overrides/spree/admin/shared/_order_tabs/add_customer_name.html.haml.deface
index f8ce05079c..2e3780460e 100644
--- a/app/overrides/spree/admin/shared/_order_tabs/add_customer_name.html.haml.deface
+++ b/app/overrides/spree/admin/shared/_order_tabs/add_customer_name.html.haml.deface
@@ -1,5 +1,6 @@
 / insert_after "code[erb-silent]:contains('content_for :page_title')"
 
-= @order.bill_address.firstname
-= @order.bill_address.lastname
-\-
+- if @order.bill_address.present?
+  = @order.bill_address.firstname
+  = @order.bill_address.lastname
+  \-