Split findOr404 method to findBy, allowing usage without exception throwing