diff --git a/src/helpers/vehicle-helper.js b/src/helpers/vehicle-helper.js
index 4d0bef51..7902b3fa 100644
--- a/src/helpers/vehicle-helper.js
+++ b/src/helpers/vehicle-helper.js
@@ -11,8 +11,9 @@ export function hasYMMExperimentPageSettingEnabled() {
 }
 
 export function hasYMMExperimentSettingEnabled() {
-    return experimentMixin.methods.hasSettingEqualTo(experimentSettings.ISS_YMMS_VIN_REQUIRED_PAGE_ENABLED, 'true')
-        || experimentMixin.methods.hasSettingEqualTo(experimentSettings.ISS_YMMS_VIN_REQUIRED_BAILOUT_ENABLED, 'true');
+    return ymmIsVinRequired()
+        && (experimentMixin.methods.hasSettingEqualTo(experimentSettings.ISS_YMMS_VIN_REQUIRED_PAGE_ENABLED, 'true')
+            || experimentMixin.methods.hasSettingEqualTo(experimentSettings.ISS_YMMS_VIN_REQUIRED_BAILOUT_ENABLED, 'true'));
 }
 
 function ymmIsVinRequired() {
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index c189471b..9c943c93 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -9,6 +9,10 @@ export default {
             let result;
             if (this.mainStore.order.vehicle.vinRequired) {
                 result = await useMainStore().getPartsOrQuestionsV2();
+                if (result.data.partsOrQuestions.length === 0) {
+                    this.navigateBailout(bailoutMessage.YMMNotFound('No Parts Returned'));
+                    return;
+                }
             } else {
                 result = await useMainStore().getPartsOrQuestions();
             }