importerror catched
Merge branch 'hotfix/importerror'