rework of the previous patch, let the error messages print out, with changes to the downloading strategy
fix typo