Improved error handling on content download