PMO-2547 import validation and error handling improved
PMO-2547 import validation and error handling improved