Maybe a `.orElseThrow(EntityNotFoundException::new)` could help to avoid a potential `NullPointerException`