Use Optional.ofNullable instead of Optional.of