RF-13794: allow upload after failure, make error messages clearer