add return statement if download failed
Merge branch 'hotfix/fix.data'