--- old/src/share/vm/runtime/thread.cpp	2015-07-20 12:40:27.075901872 -0700
+++ new/src/share/vm/runtime/thread.cpp	2015-07-20 12:40:26.739901861 -0700
@@ -3319,8 +3319,13 @@
   jint ergo_result = Arguments::apply_ergo();
   if (ergo_result != JNI_OK) return ergo_result;
 
-  // Final check of all arguments after ergonomics which may change values.
-  if (!CommandLineFlags::check_all_ranges_and_constraints()) {
+  // Final check of all ranges after ergonomics which may change values.
+  if (!CommandLineFlags::check_ranges()) {
+    return JNI_EINVAL;
+  }
+
+  // Final check of all 'AfterErgo' constraints after ergonomics which may change values.
+  if (!CommandLineFlags::check_constraints_of_after_ergo()) {
     return JNI_EINVAL;
   }