Refactor rescue logic into a private method, make it less dumb about not_found