diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index b71595e74..98d28ca1a 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-24  Pavel Roskin  <proski@gnu.org>
+
+	* vfs.c (vfs_parse_ls_lga): Better error message, avoid empty
+	error messages.
+
 2002-08-23  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.am: Use mcserv_LDFLAGS, not mcserv_LDADD for the
diff --git a/vfs/vfs.c b/vfs/vfs.c
index d312f5a88..fe01c1602 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -1852,13 +1852,12 @@ error:
       static int errorcount = 0;
 
       if (++errorcount < 5) {
-	message_1s (1, _("Could not parse:"), p_copy ? p_copy : line);
+	message_1s (1, _("Could not parse:"), (p_copy && *p_copy) ? p_copy : line);
       } else if (errorcount == 5)
-	message_1s (1, _("More parsing errors will be ignored."), _("(sorry)"));
+	message_1s (1, _(" Error "), _("More parsing errors will be ignored."));
     }
 
-    if (p_copy)
-	g_free (p_copy);
+    g_free (p_copy);
     return 0;
 }