Change way to test null options