Merge "Fix a class-loading bug in the verifier when throwing NPE"