--- a/hotspot/src/share/vm/classfile/classLoaderData.inline.hpp	Fri Apr 29 14:17:34 2016 +0300
+++ b/hotspot/src/share/vm/classfile/classLoaderData.inline.hpp	Tue Apr 26 23:29:51 2016 +0530
@@ -45,7 +45,7 @@
 
 
 inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader, TRAPS) {
-  assert(loader() != NULL,"Must be a class loader");
+  guarantee(loader() != NULL && loader()->is_oop(), "Loader must be oop");
   // Gets the class loader data out of the java/lang/ClassLoader object, if non-null
   // it's already in the loader_data, so no need to add
   ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data(loader());