Better handling of upload response