Error records locales refactor