fix retries, log auth errors
don't rescue non-connection errors!
clean up retry message