diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
index 1265583df13..f2fd9315dd3 100644
--- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
+++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
@@ -2,14 +2,12 @@
 
 import static java.util.Objects.requireNonNullElse;
 
-import graphql.schema.CoercingParseValueException;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike;
 import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSRentalUris;
-import org.opentripplanner.apis.gtfs.GraphQLScalars;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
@@ -87,6 +85,7 @@ public VehicleRentalVehicle mapFreeVehicleStatus(GBFSBike vehicle) {
       // if the propulsion type has an engine current_range_meters is required
       if (
         vehicle.getVehicleTypeId() != null &&
+        vehicleTypes.get(vehicle.getVehicleTypeId()) != null &&
         vehicleTypes.get(vehicle.getVehicleTypeId()).propulsionType !=
         RentalVehicleType.PropulsionType.HUMAN &&
         rangeMeters == null
diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java
index 02295ce09e9..79322d325fc 100644
--- a/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java
+++ b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java
@@ -37,7 +37,7 @@ class GbfsFreeVehicleStatusMapperTest {
         new FeedScopedId("1", "scooter"),
         "Scooter",
         RentalFormFactor.SCOOTER,
-        null,
+        RentalVehicleType.PropulsionType.COMBUSTION,
         null
       )
     )
@@ -62,7 +62,6 @@ void withDefaultType() {
     bike.setLon(1d);
     bike.setVehicleTypeId("bike");
     var mapped = MAPPER.mapFreeVehicleStatus(bike);
-
     assertEquals("Default vehicle type", mapped.name.toString());
   }
 
@@ -73,6 +72,7 @@ void withType() {
     bike.setLat(1d);
     bike.setLon(1d);
     bike.setVehicleTypeId("scooter");
+    bike.setCurrentRangeMeters(2000d);
     var mapped = MAPPER.mapFreeVehicleStatus(bike);
 
     assertEquals("Scooter", mapped.name.toString());