fix
Merge pull request #839 from andrzej-jankowski/autoscan_fix

Better errors handling