Better handle for boolean defaults and nulls