Handle more error cases in import from nectil
Merge branch 'master' of github.com:speculoos/bmabru