diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index de8581ad..ae6cb838 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -857,25 +857,29 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 else
                     $date_purchase = $obj->getDateFulfill();
 
-                $plate_number = $this->wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
-
-                $batt_list = array();
-                $invoice = $obj->getInvoice();
-                if (!empty($invoice))
+                // validate plate number
+                // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
+                $plate_number = Warranty::cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
+                if ($plate_number != false)
                 {
-                    // get battery
-                    $invoice_items = $invoice->getItems();
-                    foreach ($invoice_items as $item)
+                    $batt_list = array();
+                    $invoice = $obj->getInvoice();
+                    if (!empty($invoice))
                     {
-                        $battery = $item->getBattery();
-                        if ($battery != null)
+                        // get battery
+                        $invoice_items = $invoice->getItems();
+                        foreach ($invoice_items as $item)
                         {
-                            $batt_list[] = $item->getBattery();
+                            $battery = $item->getBattery();
+                            if ($battery != null)
+                            {
+                                $batt_list[] = $item->getBattery();
+                            }
                         }
                     }
-                }
 
-                $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
+                    $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
+                }
             }
         }
     }
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 105a98ac..94067844 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -723,27 +723,30 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
                 else
                     $date_purchase = $obj->getDateFulfill();
 
-                $plate_number = $this->wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
-
-                $batt_list = array();
-                $invoice = $obj->getInvoice();
-                if (!empty($invoice))
+                // validate plate number
+                // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
+                $plate_number = Warranty::cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
+                if ($plate_number != false)
                 {
-                    // get battery
-                    $invoice_items = $invoice->getItems();
-                    foreach ($invoice_items as $item)
+                    $batt_list = array();
+                    $invoice = $obj->getInvoice();
+                    if (!empty($invoice))
                     {
-                        $battery = $item->getBattery();
-                        if ($battery != null)
+                        // get battery
+                        $invoice_items = $invoice->getItems();
+                        foreach ($invoice_items as $item)
                         {
-                            $batt_list[] = $item->getBattery();
+                            $battery = $item->getBattery();
+                            if ($battery != null)
+                            {
+                                $batt_list[] = $item->getBattery();
+                            }
                         }
                     }
+
+                    $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
                 }
-
-                $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
             }
-
         }
     }