--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp	Wed Jul 28 17:57:43 2010 -0400
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp	Tue Aug 03 08:13:38 2010 -0400
@@ -941,7 +941,9 @@
             VerifyBeforeExit ||
             PrintAssembly    ||
             tty->count() != 0 ||   // already printing
-            VerifyAfterGC, "too expensive");
+            VerifyAfterGC    ||
+    VMError::fatal_error_in_progress(), "too expensive");
+
   #endif
   // This might be sped up with a cache of the last generation that
   // answered yes.