I haven't seen these failures myself.  I'm fine with the current change if you're not comfortable with retrying on all returned error codes except 1020.