Merge "Fix issue with verification check failure on erroneous classes."