Index: vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java (revision 431586) +++ vm/vmcore/src/kernel_classes/javasrc/java/lang/Class.java (working copy) @@ -139,6 +139,8 @@ return clazz; } } + } catch (NullPointerException e) { + throw e; } catch (RuntimeException e) { throw new ClassNotFoundException(name); }