--- a/hotspot/src/share/vm/memory/metaspace.cpp	Tue Oct 15 13:56:46 2013 +0200
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Fri Oct 18 09:31:59 2013 +0200
@@ -3345,9 +3345,7 @@
   }
 
   if (result == NULL) {
-    report_metadata_oome(loader_data, word_size, mdtype, THREAD);
-    // Will not reach here.
-    return NULL;
+    report_metadata_oome(loader_data, word_size, mdtype, CHECK_NULL);
   }
 
   // Zero initialize.