Core: more on error fixes.