diff --git a/app/models/sale.rb b/app/models/sale.rb
index 010cc7df..ce1e822f 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -255,7 +255,7 @@ class Sale < ApplicationRecord
     sale_item = SaleItem.new
     
     #pull
-    sale_item.menu_category_code = menu_category.code
+    sale_item.menu_category_code = menu_category.code ? menu_category.code : nil
     sale_item.menu_category_name = menu_category.name
     sale_item.product_code = item.item_code
     sale_item.item_instance_code = item.item_instance_code
@@ -286,7 +286,7 @@ class Sale < ApplicationRecord
       menu_item = instance.menu_item
       menu_category = MenuCategory.get_menu_category(menu_item.item_code) #get menu category for menu items
 
-      sale_item.menu_category_code = menu_category.code
+      sale_item.menu_category_code = menu_category.code ? menu_category.code : nil
       sale_item.menu_category_name = menu_category.name
       sale_item.product_code       = menu_item.item_code
       sale_item.item_instance_code = item["item_instance_code"]
@@ -308,6 +308,7 @@ class Sale < ApplicationRecord
 
   def create_saleitem_diningcharges(chargeObj, block_count, diningprice, dining_name, dining_time, order_source = nil)
     sale_item = SaleItem.new
+    sale_item.menu_category_name = "Other Charge(s)"
     sale_item.product_code = chargeObj.item_code
     sale_item.product_name = dining_name.to_s + " ( " + dining_time.to_s + " )"
     sale_item.account_id = 0
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index 62db6097..419bc6b7 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -30,8 +30,11 @@ class SaleItem < ApplicationRecord
       # Original Item to add remark
       item.status = type
       item.save
+      menu_category = MenuCategory.get_menu_category(item.product_code) #get menu category for menu items
 
       sale_item = SaleItem.new
+      sale_item.menu_category_code = menu_category.code ? menu_category.code : nil
+      sale_item.menu_category_name = menu_category.name
       sale_item.product_code = item.product_code
       sale_item.item_instance_code = item.item_instance_code
       sale_item.product_name = item.product_name + " (#{type.upcase})"