Merge "Prevent exception bugs in class linker"