Merge "Small error reporting fix in class linker."