--- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp	Thu Oct 18 21:14:49 2018 +0200
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp	Thu Oct 18 23:05:01 2018 -0700
@@ -323,7 +323,7 @@
     static void check(oop obj, const char* field_name, int offset);                                                                                            \
     static void compute_offsets(TRAPS);                                                                                                                        \
   public:                                                                                                                                                      \
-    static InstanceKlass* klass() { return SystemDictionary::name##_klass(); }
+  static InstanceKlass* klass() { return SystemDictionary::name##_klass_is_loaded() ? SystemDictionary::name##_klass() : NULL; }
 
 #define END_CLASS };