diff --git a/api/orders/setOrderType.cfm b/api/orders/setOrderType.cfm
index afeab37..bb66c95 100644
--- a/api/orders/setOrderType.cfm
+++ b/api/orders/setOrderType.cfm
@@ -69,22 +69,22 @@
   <cfset var businessDeliveryFee = qBusiness.recordCount GT 0 ? qBusiness.BusinessDeliveryFlatFee : 0>
 
   <cfset out.Order = {
-    "OrderID": qOrder.OrderID,
-    "OrderUUID": qOrder.OrderUUID,
-    "OrderUserID": qOrder.OrderUserID,
-    "OrderBusinessID": qOrder.OrderBusinessID,
-    "OrderBusinessDeliveryMultiplier": qOrder.OrderBusinessDeliveryMultiplier,
-    "OrderTypeID": qOrder.OrderTypeID,
-    "OrderDeliveryFee": qOrder.OrderDeliveryFee,
-    "BusinessDeliveryFee": businessDeliveryFee,
-    "OrderStatusID": qOrder.OrderStatusID,
-    "OrderAddressID": qOrder.OrderAddressID,
-    "OrderPaymentID": qOrder.OrderPaymentID,
-    "OrderRemarks": qOrder.OrderRemarks,
+    "OrderID": val(qOrder.OrderID),
+    "OrderUUID": qOrder.OrderUUID ?: "",
+    "OrderUserID": val(qOrder.OrderUserID),
+    "OrderBusinessID": val(qOrder.OrderBusinessID),
+    "OrderBusinessDeliveryMultiplier": val(qOrder.OrderBusinessDeliveryMultiplier),
+    "OrderTypeID": val(qOrder.OrderTypeID),
+    "OrderDeliveryFee": val(qOrder.OrderDeliveryFee),
+    "BusinessDeliveryFee": val(businessDeliveryFee),
+    "OrderStatusID": val(qOrder.OrderStatusID),
+    "OrderAddressID": val(qOrder.OrderAddressID),
+    "OrderPaymentID": val(qOrder.OrderPaymentID),
+    "OrderRemarks": qOrder.OrderRemarks ?: "",
     "OrderAddedOn": qOrder.OrderAddedOn,
     "OrderLastEditedOn": qOrder.OrderLastEditedOn,
     "OrderSubmittedOn": qOrder.OrderSubmittedOn,
-    "OrderServicePointID": qOrder.OrderServicePointID
+    "OrderServicePointID": val(qOrder.OrderServicePointID)
   }>
 
   <cfset var qLI = queryExecute(
@@ -117,20 +117,20 @@
   <cfset var rows = []>
   <cfloop query="qLI">
     <cfset arrayAppend(rows, {
-      "OrderLineItemID": qLI.OrderLineItemID,
-      "OrderLineItemParentOrderLineItemID": qLI.OrderLineItemParentOrderLineItemID,
-      "OrderLineItemOrderID": qLI.OrderLineItemOrderID,
-      "OrderLineItemItemID": qLI.OrderLineItemItemID,
-      "OrderLineItemStatusID": qLI.OrderLineItemStatusID,
-      "OrderLineItemPrice": qLI.OrderLineItemPrice,
-      "OrderLineItemQuantity": qLI.OrderLineItemQuantity,
-      "OrderLineItemRemark": qLI.OrderLineItemRemark,
-      "OrderLineItemIsDeleted": qLI.OrderLineItemIsDeleted,
+      "OrderLineItemID": val(qLI.OrderLineItemID),
+      "OrderLineItemParentOrderLineItemID": val(qLI.OrderLineItemParentOrderLineItemID),
+      "OrderLineItemOrderID": val(qLI.OrderLineItemOrderID),
+      "OrderLineItemItemID": val(qLI.OrderLineItemItemID),
+      "OrderLineItemStatusID": val(qLI.OrderLineItemStatusID),
+      "OrderLineItemPrice": val(qLI.OrderLineItemPrice),
+      "OrderLineItemQuantity": val(qLI.OrderLineItemQuantity),
+      "OrderLineItemRemark": qLI.OrderLineItemRemark ?: "",
+      "OrderLineItemIsDeleted": val(qLI.OrderLineItemIsDeleted),
       "OrderLineItemAddedOn": qLI.OrderLineItemAddedOn,
-      "ItemName": qLI.ItemName,
-      "ItemParentItemID": qLI.ItemParentItemID,
-      "ItemParentName": qLI.ItemParentName,
-      "ItemIsCheckedByDefault": qLI.ItemIsCheckedByDefault
+      "ItemName": qLI.ItemName ?: "",
+      "ItemParentItemID": val(qLI.ItemParentItemID),
+      "ItemParentName": qLI.ItemParentName ?: "",
+      "ItemIsCheckedByDefault": val(qLI.ItemIsCheckedByDefault)
     })>
   </cfloop>