Refactor not found exceptions