Merge pull request #2 from Tolstyak/failed-download-handling

Failed download handling
Merge remote-tracking branch 'origin/failed-download-handling'