Added handlers with restarts on client/authorization method for suppression of errors.