Wrap certain exception types when loading an erroneous class.
am: 7c8aa83571

Change-Id: I09900135d574d750aed5f84a669d3b748e80b4b6