options should use default only if null

Setting an option to false previously used the default, instead of using false