diff --git a/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs b/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs
index 02d83a3..7db5cfb 100644
--- a/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs
+++ b/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs
@@ -141,11 +141,18 @@ public class SearchAllQueryHandler :
         // Find paths
 
         var departureAddress = routeAddressDetails
-            .First(e => e.RouteAddress.Address.Guid == request.DepartureAddressGuid)
-            .RouteAddress.Address;
+            .FirstOrDefault(
+                e => e.RouteAddress.Address.Guid == request.DepartureAddressGuid)
+            ?.RouteAddress.Address;
         var arrivalAddress = routeAddressDetails
-            .First(e => e.RouteAddress.Address.Guid == request.ArrivalAddressGuid)
-            .RouteAddress.Address;
+            .FirstOrDefault(
+                e => e.RouteAddress.Address.Guid == request.ArrivalAddressGuid)
+            ?.RouteAddress.Address;
+
+        if (departureAddress == null || arrivalAddress == null)
+        {
+            throw new NotFoundException();
+        }
 
 
         var paths = new List<List<TaggedEdge<Address, RouteAddressDetail>>>();