diff -u nano/files.c nano-testpatch/files.c
--- nano/files.c	Mon Mar 25 08:40:39 2002
+++ nano-testpatch/files.c	Tue Mar 26 02:34:25 2002
@@ -243,17 +243,17 @@
 	buf[0] = 0;
     }
 
-    /* Did we try to insert a file of 0 bytes? */
-    if (num_lines == 0)
-    {
-	statusbar(_("Read %d lines"), 0);
-	return 1;
-    }
-
     /* Did we even GET a file if we don't already have one? */
     if (totsize == 0 || fileptr == NULL) {
 	new_file();
 	statusbar(_("Read %d lines"), num_lines);
+	return 1;
+    }
+
+    /* Did we try to insert a file of 0 bytes? */
+    if (num_lines == 0)
+    {
+	statusbar(_("Read %d lines"), 0);
 	return 1;
     }
 
diff -u nano/nano.c nano-testpatch/nano.c
--- nano/nano.c	Sun Mar 24 22:25:17 2002
+++ nano-testpatch/nano.c	Tue Mar 26 02:36:18 2002
@@ -369,6 +369,7 @@
     filestruct *temp;
     int i = 1;
 
+    assert(fileage==NULL || fileage!=fileage->next);
     for (temp = fileage; temp != NULL; temp = temp->next) {
 	temp->lineno = i++;
     }
@@ -384,6 +385,7 @@
 	renumber_all();
 	return 0;
     }
+    assert(fileptr==NULL || fileptr!=fileptr->next);
     for (temp = fileptr; temp != NULL; temp = temp->next) {
 	if (temp->prev != NULL)
 	    temp->lineno = temp->prev->lineno + 1;