diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js b/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js index e0a5113cd2e8e..e46a61eb6dc39 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js +++ b/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js @@ -65,7 +65,7 @@ define([ invalid; invalid = _.find(result, function (item) { - return !item.valid; + return typeof item !== 'undefined' && !item.valid; }); if (invalid) { diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js b/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js index e7b2444dad95c..0871c5a25553b 100644 --- a/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js +++ b/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js @@ -229,6 +229,9 @@ define([ * Validate everything validatable in modal */ validate: function (elem) { + if (typeof elem === 'undefined') { + return; + } if (typeof elem.validate === 'function') { this.valid = this.valid & elem.validate().valid; } else if (elem.elems) {