Refactor find_or_error() #18