diff --git a/src/components/Contexts/FleetContext.jsx b/src/components/Contexts/FleetContext.jsx
index 022efae..2173d9d 100644
--- a/src/components/Contexts/FleetContext.jsx
+++ b/src/components/Contexts/FleetContext.jsx
@@ -155,8 +155,10 @@ export const FleetProvider = ({ children }) => {
     const result = await updatesApi.getCarUpdateProgress(
       carUpdateIdsRef.current.join(","),
       token
-    );
-    let pivot = result.statuses.length - 1;
+    ).catch(() => {
+      return Promise.reject();
+    });
+    let pivot = result.statuses?.length ? result.statuses.length - 1 : 0;
     setFleetVehicles((fleetVehicles) => fleetVehicles.map((vehicle) => {
       result.statuses.find((status, i) => {
         if (vehicle.car_update_id !== status.car_update_id) {
@@ -313,7 +315,7 @@ export const FleetProvider = ({ children }) => {
 
   useEffect(() => {
     setCarUpdateIds(() => fleetVehicles
-      .filter((vehicle) => vehicle.car_update_status !== "installed")
+      .filter((vehicle) => vehicle.car_update_status && vehicle.car_update_status !== "installed")
       .map((vehicle) => vehicle.car_update_id));
   }, [fleetVehicles, setCarUpdateIds]);