diff --git a/ChangeLog b/ChangeLog
index 3e460d302c..98ef88c867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-04  Dave Peticolas  <dave@krondo.com>
+
+	* Makefile.am: add gnc-glossary.txt to the dist
+
+	* src/engine/sixtp.c (sixtp_handle_catastrophe): fix bug -- don't
+	destroy last stack frame
+
 2001-07-03  Dave Peticolas  <dave@krondo.com>
 
 	* src/scm/report/register.scm: add exported functions and needed modules
diff --git a/Makefile.am b/Makefile.am
index 6f53d2db8a..770b04510e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST = \
   gnucash.lsm \
   make-gnucash-patch.in \
   po/.cvsignore \
+  po/gnc-glossary.txt \
   po/README
 
 ## We borrow guile's convention and use @-...-@ as the substitution
diff --git a/src/engine/sixtp.c b/src/engine/sixtp.c
index c1854863e7..889fecfa54 100644
--- a/src/engine/sixtp.c
+++ b/src/engine/sixtp.c
@@ -631,6 +631,12 @@ sixtp_handle_catastrophe(sixtp_sax_data *sax_data) {
       }
     }
 
+    if((*stack)->next == NULL) {
+      /* This is the top of the stack. The top frame seems to want to
+       * be destroyed by sixtp_context_destroy. */
+      break;
+    }
+
     *stack = sixtp_pop_and_destroy_frame(*stack);
   }
 }