first rescue refactoring step for #302