From c65e38be4e2bdd8549c252ed9b89e1bad32c125b Mon Sep 17 00:00:00 2001
From: Andrey Kozlov <yecli.github@gmail.com>
Date: Fri, 17 Apr 2020 08:54:24 +0500
Subject: [PATCH] VP-1948: Fix possible null reference exception

---
 assets/js/common-components/paymentMethods.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/js/common-components/paymentMethods.js b/assets/js/common-components/paymentMethods.js
index ba7608ae..45e255c7 100644
--- a/assets/js/common-components/paymentMethods.js
+++ b/assets/js/common-components/paymentMethods.js
@@ -19,7 +19,10 @@ storefrontApp.component('vcPaymentMethods', {
                 ctrl.availPaymentMethods = _.sortBy(methods, function (x) { return x.priority; });
                 if (ctrl.paymentMethod) {
                     ctrl.paymentMethod = _.findWhere(ctrl.availPaymentMethods, { code: ctrl.paymentMethod.code });
-                    ctrl.selectMethod(ctrl.paymentMethod);
+
+                    if (ctrl.paymentMethod) {
+                        ctrl.selectMethod(ctrl.paymentMethod);
+                    }
                 }
                 if (!ctrl.paymentMethod && ctrl.availPaymentMethods.length > 0) {
                     ctrl.selectMethod(ctrl.availPaymentMethods[0]);