Added some error handling on downloads