Exception handling for downloads
Merge branch 'master' into cuttingedge