diff --git a/src/ChangeLog b/src/ChangeLog
index 993b743572..cc42a2a80f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-24  Angus Leeming  <leeming@lyx.org>
+
+	* lyxfunc.C (dispatch): remove test code in LFUN_QUIT handler as
+	it leads to a crash when no buffer is present.
+
 2004-03-25  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
             Martin Vermeer  <martin.vermeer@hut.fi>
 
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 0403030ebc..68ba1ef6c6 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -687,22 +687,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
 			break;
 
 		case LFUN_QUIT:
-#if 1
-			// test speed of DocumentIterator
-			lyxerr << "start" << endl;
-			for (DocumentIterator it(owner->buffer()->inset()), end;
-				it != end; it.forwardPos())
-				;
-			lyxerr << "end" << endl;
-#endif
-#if 1
-			// show some sizes
-			lyxerr << "sizeof Paragraph: " << sizeof(Paragraph) << endl;
-			lyxerr << "sizeof Spacing: " << sizeof(Spacing) << endl;
-			lyxerr << "sizeof LyXLength: " << sizeof(LyXLength) << endl;
-			lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
-			lyxerr << "sizeof LyXAlignment: " << sizeof(LyXAlignment) << endl;
-#endif
 			QuitLyX();
 			break;