X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=16af0c3cdf818135dc8686c97b362eed0a0e0fde;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c46224fbbc596d4de4123b0de2257dadcfa8f93d;hpb=c423fa1e62d3060b592ea9e56c841649b8504d8b;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index c46224fbbc..16af0c3cdf 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -257,8 +257,9 @@ push_paper (Lily_parser *parser, Output_def *paper)
 void
 pop_paper (Lily_parser *parser)
 {
-  parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
-                                  scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
+  if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers")))
+    parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
+                                    scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
 }
 
 /* Change the paper on top of $papers stack */