diff --git a/src/fmg-components/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/fmg-components/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
index d894f2ee8..9cb256f5d 100644
--- a/src/fmg-components/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
+++ b/src/fmg-components/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
@@ -59,7 +59,7 @@ export default {
                 return item.partType === "RAIN DEFENSE";
             });
 
-            const price = lineItem.laborAmount + lineItem.sellingPrice + lineItem.kitPrice;
+            const price = lineItem?.laborAmount + lineItem?.sellingPrice + lineItem?.kitPrice;
             return parseFloat(price).toFixed(2);
         },
         wipersPrice() {
@@ -68,7 +68,7 @@ export default {
                 return item.partType.includes(" WIPER");
             });
             lineItems?.forEach((item) => {
-                price += item.laborAmount + item.sellingPrice + item.kitPrice;
+                price += item?.laborAmount + item?.sellingPrice + item?.kitPrice;
             });
             return parseFloat(price).toFixed(2);
         },
@@ -87,12 +87,12 @@ export default {
             };
 
             if (this.showAddWipers) {
-                const answer = getAnswer("ADD WIPER BLADES", this.answersCmsData);
+                const answer = getAnswer("WipersModal", this.answersCmsData);
                 answer.SubText = "+$" + this.wipersPrice;
                 answers.push(answer);
             }
             if (this.showAddRainDefense) {
-                const answer = getAnswer("ADD RAIN DEFENSE", this.answersCmsData);
+                const answer = getAnswer("RainDefenseModal", this.answersCmsData);
                 answer.SubText = "+$" + this.rainDefensePrice;
                 answers.push(answer);
             }
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index e587bbbcc..aae91052c 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -111,7 +111,6 @@ export default {
             null,
             "payment-method"
         );
-        console.log("rainDefensePromise: ", rainDefensePromise);
 
         const supportingItemsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_SUPPORTING_ITEMS,