--- a/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp	Mon Mar 17 19:38:34 2014 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp	Mon Mar 17 19:44:16 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -488,11 +488,14 @@
     TRY;
 
     AwtScrollbar::lineIncrementID = env->GetFieldID(cls, "lineIncrement", "I");
-    AwtScrollbar::pageIncrementID = env->GetFieldID(cls, "pageIncrement", "I");
-    AwtScrollbar::orientationID = env->GetFieldID(cls, "orientation", "I");
+    DASSERT(AwtScrollbar::lineIncrementID != NULL);
+    CHECK_NULL(AwtScrollbar::lineIncrementID);
 
-    DASSERT(AwtScrollbar::lineIncrementID != NULL);
+    AwtScrollbar::pageIncrementID = env->GetFieldID(cls, "pageIncrement", "I");
     DASSERT(AwtScrollbar::pageIncrementID != NULL);
+    CHECK_NULL(AwtScrollbar::pageIncrementID);
+
+    AwtScrollbar::orientationID = env->GetFieldID(cls, "orientation", "I");
     DASSERT(AwtScrollbar::orientationID != NULL);
 
     CATCH_BAD_ALLOC;