OFC-1186 Unit field validation performed even when numeric value is null
or 0