Fix download url; Add return on error