diff --git a/app/views/spree/admin/orders/invoice.html.haml b/app/views/spree/admin/orders/invoice.html.haml
index bc2b4dc556..ff4a930e5a 100644
--- a/app/views/spree/admin/orders/invoice.html.haml
+++ b/app/views/spree/admin/orders/invoice.html.haml
@@ -33,16 +33,19 @@
       %td{ align: "left" }
         %strong= "#{t('.to')}:"
         %br
-        = @order.bill_address.full_name
+        - if @order.bill_address
+          = @order.bill_address.full_name
         - if @order.andand.customer.andand.code.present?
           %br
           = "#{t('.code')}: #{@order.customer.code}"
         %br
-        = @order.bill_address.full_address
+        - if @order.bill_address
+          = @order.bill_address.full_address
         %br
         - if @order.andand.customer.andand.email.present?
           = "#{@order.customer.email},"
-        = "#{@order.bill_address.phone}"
+        - if @order.bill_address
+          = "#{@order.bill_address.phone}"
       %td
          
       %td{ align: "left", style: "border-left: .1em solid black; padding-left: 1em" }
diff --git a/app/views/spree/admin/orders/invoice2.html.haml b/app/views/spree/admin/orders/invoice2.html.haml
index 7964f80e56..b9715c2770 100644
--- a/app/views/spree/admin/orders/invoice2.html.haml
+++ b/app/views/spree/admin/orders/invoice2.html.haml
@@ -44,14 +44,17 @@
       %td{ :align => "right" }
         = t :invoice_billing_address
         %br
-        %strong= @order.bill_address.full_name
+        - if @order.bill_address
+          %strong= @order.bill_address.full_name
         - if @order.andand.customer.andand.code.present?
           %br
           = "Code: #{@order.customer.code}"
         %br
-        = @order.bill_address.address_part1
+        - if @order.bill_address
+          = @order.bill_address.address_part1
         %br
-        = @order.bill_address.address_part2
+        - if @order.bill_address
+          = @order.bill_address.address_part2
 
 = render 'spree/admin/orders/invoice_table2'