--- old/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp	2018-09-28 14:57:54.691708650 -0700
+++ new/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp	2018-09-28 14:57:54.491708657 -0700
@@ -20,12 +20,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 #include <jni.h>
 #include <stdio.h>
 #include <time.h>
 #include "jni_tools.h"
-#include "ExceptionCheckingJniEnv.hpp"
 
 extern "C" {
 
@@ -37,18 +35,28 @@
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNIGlobalRefLocker_criticalNative
-  (JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
-        ExceptionCheckingJniEnvPtr env(jni_env);
-
+  (JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
         jobject obj;
         jobject gref;
         time_t start_time, current_time;
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
+                if (klass == NULL) {
+                        printf("Error: GetObjectClass returned NULL\n");
+                        return;
+                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
+                if (objFieldId == NULL) {
+                        printf("Error: GetFieldID returned NULL\n");
+                        return;
+                }
         }
         obj = env->GetObjectField(o, objFieldId);
+        if (obj == NULL) {
+                printf("Error: GetObjectField returned NULL\n");
+                return;
+        }
         env->SetObjectField(o, objFieldId, NULL);
         start_time = time(NULL);
         enterTime /= 1000;