Make the original image download logic a little more robust