diff --git a/lib/liquid/context.rb b/lib/liquid/context.rb
index d37cf910..3ff8dfaf 100644
--- a/lib/liquid/context.rb
+++ b/lib/liquid/context.rb
@@ -88,9 +88,12 @@ module Liquid
     #   context['var]  #=> nil
     def stack(new_scope={})
       push(new_scope)
-      yield
-    ensure
-      pop
+
+      begin
+        yield
+      ensure
+        pop
+      end
     end
 
     def clear_instance_assigns