Mandatory check should obviously only be applied when the value is not empty