diff --git a/src/layouts/bailout-page/bailout-page.vue b/src/layouts/bailout-page/bailout-page.vue
index 10d744c2..59ba9bf4 100644
--- a/src/layouts/bailout-page/bailout-page.vue
+++ b/src/layouts/bailout-page/bailout-page.vue
@@ -104,7 +104,9 @@ export default {
         const pageData = useMainStore().pageData(to.query.issPage);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.setNotSeeingPreferShop(pageData[routerParams.NOT_SEEING_PREFERRED_SHOP]);
+            if (pageData && pageData[routerParams.NOT_SEEING_PREFERRED_SHOP]) {
+                vm.setNotSeeingPreferShop(pageData[routerParams.NOT_SEEING_PREFERRED_SHOP]);
+            }
         });
     },
     data() {
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index d7caeb78..4b5b6c34 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -127,6 +127,7 @@ import globalRules from '@/constants/global-rules.js';
 import baseFormMixin from '@/mixins/base-form-mixin.js';
 import navigationScenarios from '@/router/router-constants/navigation-scenarios.js';
 import routerParams from '@/router/router-constants/router-params';
+import issPageValues from '@/router/router-constants/issPage-values';
 
 export default {
     name: 'coverage-statement',
@@ -172,7 +173,21 @@ export default {
         let pricingResults = [];
         if (useMainStore().order.policy.policyLookupSuccessful && useMainStore().order.vehicle.policyVehicleId) {
             await useMainStore().getFinalDeductible();
-            pricingResults = await useMainStore().getPriceOrderItems(availableLineItems);
+            pricingResults = await useMainStore().getPriceOrderItems(availableLineItems)
+                .catch((err) => {
+                    const errorPageData = {
+                        errorData: err.data,
+                        functionLocation: 'beforeRouteEnter',
+                        functionName: 'getPriceOrderItems',
+                        functionParameters: {
+                            availableLineItems
+                        },
+                        routeFrom: from,
+                        routeTo: to
+                    };
+                    useMainStore().updatePageData({ page: issPageValues.BAILOUT_PAGE, data: errorPageData });
+                    next(`/?issPage=${issPageValues.BAILOUT_PAGE}`);
+                });
         }
 
         // Call the "next" function to complete the transition to this page.
diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index d704731e..c2a0741b 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -180,7 +180,7 @@ export default {
                         if (vehicleLookupResponse.status === 404) {
                             this.mainStore.resetVehicleState();
                             useMainStore().updateVehicle({
-                                policyVehicleId: vehicle.fleetUnitNumber,
+                                policyVehicleId: vehicle.id,
                                 carId: '0',
                                 category: '',
                                 year: vehicle.vehicleYear || '',
@@ -202,7 +202,7 @@ export default {
                     }
 
                     this.vehicleFromLookup = Object.assign(vehicleLookupResponse.data, {
-                        policyVehicleId: vehicle.fleetUnitNumber,
+                        policyVehicleId: vehicle.id,
                         vin: this.selectedVehicleVin,
                         noCoverage: this.noCoverageForSelectedVehicle,
                         deductible: this.deductibleForSelectedVehicle,
diff --git a/src/store/index.js b/src/store/index.js
index 0bf476fb..2f870abc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -917,7 +917,7 @@ export const useMainStore = defineStore({
                     endpoint: `${endpoints.GetInsurancePriceOrderItems.url}?${queryString}`
                 }).catch((error) => {
                     console.error(error);
-                    return [];
+                    throw error;
                 });
 
             if (response.data?.lineItems) {