--- a/src/share/vm/c1x/c1x_Compiler.cpp	Tue Jul 13 11:47:55 2010 -0700
+++ b/src/share/vm/c1x/c1x_Compiler.cpp	Fri Jul 23 15:53:02 2010 -0700
@@ -34,15 +34,11 @@
 	TRACE_C1X_1("initialize");
 
   JNIEnv *env = ((JavaThread *)Thread::current())->jni_environment();
-  jclass klass = env->FindClass("com/sun/hotspot/c1x/VMEntries");
+  jclass klass = env->FindClass("com/sun/hotspot/c1x/VMEntriesNative");
   assert(klass != NULL, "c1x VMEntries class not found");
   env->RegisterNatives(klass, VMEntries_methods, VMEntries_methods_count() );
   
-  if (Thread::current()->has_pending_exception()) {
-
-    Thread::current()->pending_exception()->print();
-    fatal("Could not register natives");
-  }
+  check_pending_exception("Could not register natives");
 }
 
 // Compilation entry point for methods
@@ -54,7 +50,7 @@
 
 	
 	ResourceMark rm;
-	//HandleMark hm;
+	HandleMark hm;
 
   CompilerThread::current()->set_compiling(true);
   oop rimethod = get_RiMethod(target);