diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index 6a6d3d91..a0a93bf1 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -725,16 +725,20 @@ class RiderAppController extends APIController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
-        // set delivery status
-        $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB);
+        // check if JO is null
+        if ($jo)
+        {
+            // set delivery status
+            $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB);
 
-        $timestamp_event = new JOEvent();
-        $timestamp_event->setDateHappen(new DateTime())
-            ->setTypeID(JOEventType::RIDER_ARRIVE_HUB)
-            ->setJobOrder($jo)
-            ->setRider($rider);
+            $timestamp_event = new JOEvent();
+            $timestamp_event->setDateHappen(new DateTime())
+                ->setTypeID(JOEventType::RIDER_ARRIVE_HUB)
+                ->setJobOrder($jo)
+                ->setRider($rider);
 
-        $em->persist($timestamp_event);
+            $em->persist($timestamp_event);
+        }
 
         // tag rider as available
         $rider->setAvailable(true);