ACP2E-2301: Customers and Addresses (single file) Import fails

Author: AnujNehra

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -534,6 +534,9 @@ protected function _importData()
             $deleteRowIds = [];
 
             foreach ($bunch as $rowNumber => $rowData) {
+                if (!isset($rowData['_website'])) {
+                    continue;
+                }
                 // check row data
                 if ($this->_isOptionalAddressEmpty($rowData) || !$this->validateRow($rowData, $rowNumber)) {
                     continue;

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -519,6 +519,9 @@ protected function _importData()
             $attributesToSave = [];
 
             foreach ($bunch as $rowNumber => $rowData) {
+                if (!isset($rowData['_website'])) {
+                    continue;
+                }
                 if (!$this->validateRow($rowData, $rowNumber)) {
                     continue;
                 }

app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/CustomerComposite/Data.php

@@ -80,7 +80,7 @@ public function getNextUniqueBunch($ids = null)
     protected function _prepareRow(array $rowData)
     {
         $entityCustomer = CustomerComposite::COMPONENT_ENTITY_CUSTOMER;
-        if ($this->_entityType == $entityCustomer) {
+        if ((isset($rowData['_scope'])) && $this->_entityType == $entityCustomer) {
             if ($rowData['_scope'] == CustomerComposite::SCOPE_DEFAULT) {
                 return $rowData;
             } else {