Making the uploader more robust