To keep reasonable commit size only top-level files use new errors. Will add them in other files in next commits.