--- a/jdk/src/windows/native/sun/windows/awt_Object.cpp	Tue Mar 11 11:51:14 2014 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Object.cpp	Tue Mar 11 19:13:59 2014 +0400
@@ -232,22 +232,31 @@
     TRY;
 
     AwtObject::wObjectPeerClass = (jclass)env->NewGlobalRef(cls);
+    DASSERT(AwtObject::wObjectPeerClass != NULL);
+    CHECK_NULL(AwtObject::wObjectPeerClass);
+
     AwtObject::pDataID = env->GetFieldID(cls, "pData", "J");
+    DASSERT(AwtObject::pDataID != NULL);
+    CHECK_NULL(AwtObject::pDataID);
+
     AwtObject::destroyedID = env->GetFieldID(cls, "destroyed", "Z");
+    DASSERT(AwtObject::destroyedID != NULL);
+    CHECK_NULL(AwtObject::destroyedID);
+
     AwtObject::targetID = env->GetFieldID(cls, "target",
                                               "Ljava/lang/Object;");
+    DASSERT(AwtObject::targetID != NULL);
+    CHECK_NULL(AwtObject::targetID);
 
     AwtObject::getPeerForTargetMID =
         env->GetStaticMethodID(cls, "getPeerForTarget",
                          "(Ljava/lang/Object;)Lsun/awt/windows/WObjectPeer;");
+    DASSERT(AwtObject::getPeerForTargetMID != NULL);
+    CHECK_NULL(AwtObject::getPeerForTargetMID);
 
     AwtObject::createErrorID = env->GetFieldID(cls, "createError", "Ljava/lang/Error;");
-
-    DASSERT(AwtObject::pDataID != NULL);
-    DASSERT(AwtObject::destroyedID != NULL);
-    DASSERT(AwtObject::targetID != NULL);
-    DASSERT(AwtObject::getPeerForTargetMID != NULL);
     DASSERT(AwtObject::createErrorID != NULL);
+    CHECK_NULL(AwtObject::createErrorID);
 
     CATCH_BAD_ALLOC;
 }