1 files changed, 7 insertions, 2 deletions
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index 19c59e2ccc..a0f1cbeaa8 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -228,7 +228,7 @@ class Ripper
 
     def on_heredoc_end(tok)
       @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
-      @buf = @stack.pop
+      @buf = @stack.pop unless @stack.empty?
     end
 
     def _push_token(tok)
@@ -242,7 +242,12 @@ class Ripper
     end
 
     def on_error2(mesg, elem)
-      @errors.push Elem.new(elem.pos, __callee__, elem.tok, elem.state, mesg)
+      if elem
+        elem = Elem.new(elem.pos, __callee__, elem.tok, elem.state, mesg)
+      else
+        elem = Elem.new([lineno(), column()], __callee__, token(), state(), mesg)
+      end
+      @errors.push elem
     end
     PARSER_EVENTS.grep(/_error\z/) do |e|
       arity = PARSER_EVENT_TABLE.fetch(e)