Reworkes import errors handling