bug #2480: Use default values for enforce and ds_id if nil