diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 8ced2beeb..feba06ae3 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -36,12 +36,7 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}) {
 
     // If navigating to a specific page, and that page is not part of the vin pages.
     // Return that page, so that it can navigate like normal.
-    if (
-        toRoute.query[queryStrings.FMG_PAGE] !== undefined &&
-        toRoute.query[queryStrings.FMG_PAGE] !== fmgPageValues.SERVICE_LOCATION &&
-        toRoute.query[queryStrings.FMG_PAGE] !== fmgPageValues.SCHEDULE &&
-        !isVinRelatedPage(toRoute)
-    ) {
+    if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) {
         return overrideYmmsDirectionIfNeeded(toRoute);
     }
 
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 353612d5d..76fd20c5d 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -469,7 +469,7 @@ export default {
                     supportingItems[mobileFeeIndex].sellingPrice = this.mobileFeePart.sellingPrice;
                     supportingItems[mobileFeeIndex].kitPrice = this.mobileFeePart.kitPrice;
                 } else {
-                    supportingItems.push(this.mobileFeePart);
+                    if (this.mobileFeePart !== null) supportingItems.push(this.mobileFeePart);
                 }
 
                 this.dispatchStoreAction(