Merge pull request #7164 from fcarriedo/not-error-as-var-name

pkg/units: Better to not use `error` as var name