diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index a9929c16..d41ebc8f 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -1911,6 +1911,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         if (isset($data['error']))
         {
             $data['title'] = 'Failed Get Ongoing Job Order';
+            $data['job_order'] = null;
             return $data;
         }
 
@@ -1919,7 +1920,8 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         {
             $data = [
                 'title' => 'Failed Get Ongoing Job Order',
-                'error' => 'No logged in rider.'
+                'error' => 'No logged in rider.',
+                'job_order' => null,
             ];
             return $data;
         }
@@ -1932,7 +1934,8 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         {
             $data = [
                 'title' => 'Failed Get Ongoing Job Order',
-                'error' => 'No active job order.'
+                'error' => 'No active job order.',
+                'job_order' => null,
             ];
             return $data;
         }