diff --git a/backend/functions.php b/backend/functions.php
index 433c9e94..c1f90662 100644
--- a/backend/functions.php
+++ b/backend/functions.php
@@ -218,11 +218,13 @@ function findBestDrivers($con, $lat, $lng, $carType, $endLat = null, $endLng = n
             }
 
             if (isset($redisMap[$did])) {
-                $driver['distance_km'] = $redisMap[$did]['distance'];
-                $driver['lat'] = $redisMap[$did]['lat'];
-                $driver['lng'] = $redisMap[$did]['lng'];
+                $driver['distance_km'] = $redisMap[$did]['distance'] ?? 999;
+                $driver['lat'] = $redisMap[$did]['lat'] ?? $redisMap[$did]['latitude'] ?? 0;
+                $driver['lng'] = $redisMap[$did]['lng'] ?? $redisMap[$did]['longitude'] ?? 0;
             } else {
                 $driver['distance_km'] = 999;
+                $driver['lat'] = 0;
+                $driver['lng'] = 0;
             }
             
             $filteredDrivers[] = $driver;