Additional changes to support the domain id not erroring when the field is blank