--- a/hotspot/src/share/vm/memory/dump.cpp	Wed Apr 15 21:31:46 2009 -0700
+++ b/hotspot/src/share/vm/memory/dump.cpp	Fri Apr 17 12:22:18 2009 -0700
@@ -929,7 +929,8 @@
     guarantee(SystemDictionary::constraints()->number_of_entries() == 0,
               "loader constraints are not saved");
     // Revisit and implement this if we prelink method handle call sites:
-    guarantee(SystemDictionary::invoke_method_table()->number_of_entries() == 0,
+    guarantee(SystemDictionary::invoke_method_table() == NULL ||
+              SystemDictionary::invoke_method_table()->number_of_entries() == 0,
               "invoke method table is not saved");
     GenCollectedHeap* gch = GenCollectedHeap::heap();