diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index 3dd1b8e6..282f6bb6 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -2047,7 +2047,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         if (isset($data['error']))
         {
             $data['title'] = 'Failed Get Ongoing Job Order';
-            $data['job_order'] = null;
+            $data['job_order'] = [];
             return $data;
         }
 
@@ -2073,9 +2073,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         if ($jo == null)
         {
             $data = [
-                'title' => 'Failed Get Ongoing Job Order',
-                'error' => 'No active job order.',
-                'job_order' => null,
+                //'title' => 'Failed Get Ongoing Job Order',
+                //'error' => 'No active job order.',
+                'job_order' => [],
             ];
             return $data;
         }