options should use default only if null

Setting an option to false previously used the default, instead of using false.

Not really sure how to test this since I don't know how to set the default value in the tests