--- a/hotspot/src/share/vm/memory/allocation.cpp	Thu Nov 13 11:14:01 2014 +0100
+++ b/hotspot/src/share/vm/memory/allocation.cpp	Fri Nov 14 09:47:09 2014 +0100
@@ -50,8 +50,7 @@
                                  size_t word_size, bool read_only,
                                  MetaspaceObj::Type type, TRAPS) throw() {
   // Klass has it's own operator new
-  return Metaspace::allocate(loader_data, word_size, read_only,
-                             type, CHECK_NULL);
+  return Metaspace::allocate(loader_data, word_size, read_only, type, THREAD);
 }
 
 bool MetaspaceObj::is_shared() const {