diff --git a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
index ab6ff1b7..73019af5 100644
--- a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
+++ b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
@@ -197,15 +197,19 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
                       return;
                     }
                     if (_showVendorFields && (_workOrder.supplier.suppliername == null || _workOrder.supplier.suppliername.isEmpty)) {
-                      await Fluttertoast.showToast(msg: "Vendor Name is Required");
+                      await Fluttertoast.showToast(msg: "Vendor Name Field is Required");
                       return;
                     }
                     if (_showVendorFields && _workOrder.suppEngineerWorkOrders == null) {
-                      await Fluttertoast.showToast(msg: "Vendor Engineer is Required");
+                      await Fluttertoast.showToast(msg: "Vendor Engineer Field is Required");
                       return;
                     }
-                    _workOrder.suppEngineerWorkOrders ?? [];
-                    _workOrder.suppEngineerWorkOrders.add(engineer..id = 0);
+                    if (engineer != null) {
+                      _workOrder.suppEngineerWorkOrders ?? [];
+                      _workOrder.suppEngineerWorkOrders.add(engineer..id = 0);
+                    } else {
+                      await Fluttertoast.showToast(msg: "Call Last Situation Field is Required");
+                    }
                     _formKey.currentState.save();
                     widget.subWorkOrder.copyFrom(_workOrder);
                     Navigator.pop(context);