--- a/hotspot/src/share/vm/classfile/javaClasses.cpp	Tue Apr 19 14:53:33 2016 +0200
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp	Thu Apr 21 09:23:04 2016 -0400
@@ -852,6 +852,7 @@
           new (ResourceObj::C_HEAP, mtClass) GrowableArray<Klass*>(500, true);
         set_fixup_module_field_list(list);
       }
+      k->class_loader_data()->inc_keep_alive();
       fixup_module_field_list()->push(k());
     }
   } else {