If command is null a NPE occurs even though from the code it seems this
should be handled by a fallback.

This replaces Optional.of with Optional.ofNullable to account for that
case.