Use null to indicate no port has been provided. Raise exception when port has not been expanded. Issue: SPR-12123