diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 34937bfb7..dc2e53484 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -162,8 +162,10 @@ export default {
     async forwardButtonAction() {
       const vinLookup = await this.lookupVin(this.selectedVehicle.vin).catch(() => {
         this.$refs.funnelFooter.removeLoader();
-        return;
       });
+      if (!vinLookup) {
+        return;
+      }
       this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vinLookup.data.carId);
       this.updateCustomerInfo(this.selectedVehicle.vin, this.selectedVehicle.vehicle);
       this.navigateForward();
@@ -210,7 +212,7 @@ export default {
   },
 
   watch: {
-    selectedVehicleVin(vehicleVin) {
+    selectedVehicleVin() {
       // does this vehicle match the previously selected carId?
       this.isCarIdDifferent = this.selectedVehicle.vehicle.carId !== store.getters.vehicle.carId;
       this.$refs.funnelFooter.updateButtonText(`Continue with ${this.selectedVehicle.vehicle.year} ${this.selectedVehicle.vehicle.make} ${this.selectedVehicle.vehicle.model}`);