diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index ca5654b4..2ecfcd09 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -50,6 +50,12 @@ class HomeController extends Controller
         foreach ($riders as $rider_id => $rider_data)
         {
             $rider = $em->getRepository(Rider::class)->find($rider_id);
+            if ($rider == null)
+            {
+                unset $riders[$rider_id];
+                continue;
+            }
+
             $jo = $rider->getActiveJobOrder();
             if ($jo == null)
                 $riders[$rider_id]['has_jo'] = false;