diff --git a/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp b/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
index c6bd697a4ec..c1c17f9feec 100644
--- a/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
@@ -71,12 +71,16 @@ Java_java_awt_AWTEvent_initIDs(JNIEnv *env, jclass cls)
     TRY;
 
     AwtAWTEvent::bdataID = env->GetFieldID(cls, "bdata", "[B");
-    AwtAWTEvent::idID = env->GetFieldID(cls, "id", "I");
-    AwtAWTEvent::consumedID = env->GetFieldID(cls, "consumed", "Z");
-
     DASSERT(AwtAWTEvent::bdataID != NULL);
+    CHECK_NULL(AwtAWTEvent::bdataID);
+
+    AwtAWTEvent::idID = env->GetFieldID(cls, "id", "I");
     DASSERT(AwtAWTEvent::idID != NULL);
+    CHECK_NULL(AwtAWTEvent::idID);
+
+    AwtAWTEvent::consumedID = env->GetFieldID(cls, "consumed", "Z");
     DASSERT(AwtAWTEvent::consumedID != NULL);
+    CHECK_NULL(AwtAWTEvent::consumedID);
 
     CATCH_BAD_ALLOC;
 }