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

Change-Id: I6ee53bb7c0a904e7fb57d33be0d9a67496c8c844