diff --git a/src/oat/runtime/support_interpreter.cc b/src/oat/runtime/support_interpreter.cc
index ada19a3..2b23bd7 100644
--- a/src/oat/runtime/support_interpreter.cc
+++ b/src/oat/runtime/support_interpreter.cc
@@ -97,6 +97,7 @@
     if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(method->GetDeclaringClass(),
                                                                  true, true)) {
       DCHECK(Thread::Current()->IsExceptionPending());
+      self->PopManagedStackFragment(fragment);
       return 0;
     }
   }
diff --git a/src/stack.h b/src/stack.h
index 18a2101..e0cb28e 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -278,6 +278,7 @@
   }
 
   void SetTopQuickFrame(mirror::AbstractMethod** top) {
+    DCHECK(top_shadow_frame_ == NULL);
     top_quick_frame_ = top;
   }
 
@@ -286,6 +287,7 @@
   }
 
   void SetTopQuickFramePc(uintptr_t pc) {
+    DCHECK(top_shadow_frame_ == NULL);
     top_quick_frame_pc_ = pc;
   }
 
@@ -298,6 +300,7 @@
   }
 
   ShadowFrame* PushShadowFrame(ShadowFrame* new_top_frame) {
+    DCHECK(top_quick_frame_ == NULL);
     ShadowFrame* old_frame = top_shadow_frame_;
     top_shadow_frame_ = new_top_frame;
     new_top_frame->SetLink(old_frame);
@@ -305,6 +308,7 @@
   }
 
   ShadowFrame* PopShadowFrame() {
+    DCHECK(top_quick_frame_ == NULL);
     CHECK(top_shadow_frame_ != NULL);
     ShadowFrame* frame = top_shadow_frame_;
     top_shadow_frame_ = frame->GetLink();
@@ -316,6 +320,7 @@
   }
 
   void SetTopShadowFrame(ShadowFrame* top) {
+    DCHECK(top_quick_frame_ == NULL);
     top_shadow_frame_ = top;
   }