--- a/hotspot/src/share/vm/oops/klass.cpp	Thu Nov 13 11:14:01 2014 +0100
+++ b/hotspot/src/share/vm/oops/klass.cpp	Fri Nov 14 09:47:09 2014 +0100
@@ -152,7 +152,7 @@
 
 void* Klass::operator new(size_t size, ClassLoaderData* loader_data, size_t word_size, TRAPS) throw() {
   return Metaspace::allocate(loader_data, word_size, /*read_only*/false,
-                             MetaspaceObj::ClassType, CHECK_NULL);
+                             MetaspaceObj::ClassType, THREAD);
 }
 
 Klass::Klass() {