Merge "Wrap certain exception types when loading an erroneous class."