--- a/src/hotspot/share/classfile/dictionary.hpp	Thu Dec 13 11:51:06 2018 -0800
+++ b/src/hotspot/share/classfile/dictionary.hpp	Tue Jan 15 10:55:26 2019 -0800
@@ -170,7 +170,7 @@
     for (ProtectionDomainEntry* current = pd_set(); // accessed at a safepoint
                                 current != NULL;
                                 current = current->_next) {
-      guarantee(oopDesc::is_oop(current->_pd_cache->object_no_keepalive()), "Invalid oop");
+      guarantee(oopDesc::is_oop_or_null(current->_pd_cache->object_no_keepalive()), "Invalid oop");
     }
   }