#400 Improve null handling of options