diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 01be4bb3..131407f0 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -94,11 +94,13 @@
     <% else %>
       <div id="save_order_id" data-order="">
     <% end %>
-      <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
-      <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
-        <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
-      <% else %>
-        <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+      <% if !@booking.nil? %>
+        <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
+        <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
+          <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+        <% else %>
+          <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+        <% end %>
       <% end %>
       </div>
   <% elsif @status_sale == 'sale' %>
@@ -149,10 +151,10 @@
    <div class="row p-l-5 p-r-5">
         <div class="col-lg-6 col-md-6 col-sm-6">
        
-          <% if @status_sale == 'sale' %>
+          <% if @status_sale == 'sale' && !@sale_array.empty? %>
               <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
               &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
-          <% elsif @status_order == 'order'
+          <% elsif @status_order == 'order' && !@customer.nil?
              %>
               <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
               &nbsp; Customer : <%= @customer.name rescue "" %>