--- a/hotspot/src/share/vm/runtime/deoptimization.cpp	Mon Oct 27 15:09:23 2014 -0700
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp	Tue Oct 28 17:02:08 2014 -0400
@@ -1173,7 +1173,7 @@
 void Deoptimization::load_class_by_index(constantPoolHandle constant_pool, int index, TRAPS) {
   // in case of an unresolved klass entry, load the class.
   if (constant_pool->tag_at(index).is_unresolved_klass()) {
-    Klass* tk = constant_pool->klass_at(index, CHECK);
+    Klass* tk = constant_pool->klass_at_ignore_error(index, CHECK);
     return;
   }