--- a/src/hotspot/share/jvmci/jvmciEnv.cpp	Fri Jun 21 13:04:14 2019 -0700
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp	Fri Jun 21 16:21:13 2019 -0700
@@ -1361,6 +1361,9 @@
     return Handle(THREAD, obj);
   } else if (isa_IndirectHotSpotObjectConstantImpl(constant)) {
     jlong object_handle = get_IndirectHotSpotObjectConstantImpl_objectHandle(constant);
+    if (object_handle == 0L) {
+      JVMCI_THROW_MSG_(NullPointerException, "Foreign object reference has been cleared", Handle());
+    }
     oop result = resolve_handle(object_handle);
     if (result == NULL) {
       JVMCI_THROW_MSG_(InternalError, "Constant was unexpectedly NULL", Handle());