diff --git a/app/delivery/views.py b/app/delivery/views.py
index 349e110..710da8c 100755
--- a/app/delivery/views.py
+++ b/app/delivery/views.py
@@ -507,7 +507,12 @@ def edit_a_delivery(delivery_id):
         else:
             # Optionally, handle the case where the driver ID is invalid
             # For now, we'll just not update the driver info.
-            pass 
+            pass
+    else:
+        # No driver provided, set to empty values
+        get_delivery.driver_employee_id = 0
+        get_delivery.driver_first_name = ""
+        get_delivery.driver_last_name = ""
 
     # --- Handle Promotion ---
     promo_id = data.get("promo_id")
@@ -584,8 +589,7 @@ def create_a_delivery(user_id):
         prime_info = request.json["prime"]
         same_day_info = request.json["same_day"]
         emergency_info = request.json["emergency"]
-        delivery_driver_id = request.json["driver_employee_id"]
-
+        delivery_driver_id = request.json.get("driver_employee_id", 0)
 
         card_payment = request.json["credit"]
         cash_payment = request.json["cash"]
@@ -601,9 +605,9 @@ def create_a_delivery(user_id):
         except:
             promo_id = None
         if promo_id is not None:
-            get_promo_data = (db.session 
-                .query(Promo_Promo) 
-                .filter(Promo_Promo.id == promo_id) 
+            get_promo_data = (db.session
+                .query(Promo_Promo)
+                .filter(Promo_Promo.id == promo_id)
                 .first())
             promo_id_get_delivery =get_promo_data.id,
             promo_money_discount_get_delivery = get_promo_data.money_off_delivery
@@ -611,14 +615,14 @@ def create_a_delivery(user_id):
             promo_id_get_delivery =None
             promo_money_discount_get_delivery = None
 
-        
-        # 0 = cash only 
-        # 1 = credit only 
-        # 2 = credit /cash 
+
+        # 0 = cash only
+        # 1 = credit only
+        # 2 = credit /cash
         # 3 = check
-        # 4 = other 
-        # 5 = unknown 
-        
+        # 4 = other
+        # 5 = unknown
+
         if cash_payment is True:
             delivery_payment_method = 0
         if card_payment is True:
@@ -628,15 +632,18 @@ def create_a_delivery(user_id):
         if other_payment is True:
             delivery_payment_method = 4
 
-
-        get_driver = (db.session
-                       .query(Employee_Employee)
-                       .filter(Employee_Employee.id == delivery_driver_id)
-                       .first())
-
-        driver_l_name = get_driver.employee_last_name
-        driver_f_name = get_driver.employee_first_name
-        driver_emp_id = get_driver.id
+        if delivery_driver_id:
+            get_driver = (db.session
+                           .query(Employee_Employee)
+                           .filter(Employee_Employee.id == delivery_driver_id)
+                           .first())
+            driver_l_name = get_driver.employee_last_name
+            driver_f_name = get_driver.employee_first_name
+            driver_emp_id = get_driver.id
+        else:
+            driver_l_name = ""
+            driver_f_name = ""
+            driver_emp_id = 0
 
         try:
             if request.json["credit_card_id"]: