--- a/src/hotspot/share/prims/jvmtiExport.cpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/prims/jvmtiExport.cpp	Mon Sep 23 14:49:04 2019 -0400
@@ -1589,7 +1589,7 @@
     if (!exception_exit) {
       oop oop_result;
       BasicType type = current_frame.interpreter_frame_result(&oop_result, &value);
-      if (type == T_OBJECT || type == T_ARRAY) {
+      if (is_reference_type(type)) {
         result = Handle(thread, oop_result);
       }
     }