diff --git a/ChangeLog b/ChangeLog
index 18faa223..5ad2ff2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 GNU nano 2.1.1 - 2008.04.01
 
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* Fix for seg fault when window size too small, by 
+          Andreas Amann <andreas.amann@tyndall.ie>
+
 2008-05-31 Chris Allegretta <chrisa@asty.org>
 	* Added the following contributed files, by owner:
 	  Donnie Berkholz <dberkholz@gentoo.org>
diff --git a/src/nano.c b/src/nano.c
index 18fb82e2..950cffcb 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -611,7 +611,7 @@ void die(const char *msg, ...)
     va_end(ap);
 
     /* Save the current file buffer if it's been modified. */
-    if (openfile->modified) {
+    if (openfile && openfile->modified) {
 	/* If we've partitioned the filestruct, unpartition it now. */
 	if (filepart != NULL)
 	    unpartition_filestruct(&filepart);