Refactor findOr404