diff --git a/ChangeLog b/ChangeLog
index 8dd2f9729..40249b88c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-19  Gordon Matzigkeit  <gord@fig.org>
+
+	* stage2/cmdline.c (enter_cmdline): Don't give errors on empty
+	command lines.
+
+	* stage2/common.c (err_list): Clean up wordings slightly.
+
 2000-05-29  OKUJI Yoshinori  <okuji@gnu.org>
 
 	Based on a patch by Neal H Walfield <neal@walfield.org>:
diff --git a/stage2/cmdline.c b/stage2/cmdline.c
index ab1adb234..25a8dd577 100644
--- a/stage2/cmdline.c
+++ b/stage2/cmdline.c
@@ -2,7 +2,7 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
  *  Copyright (C) 1996  Erich Boleyn  <erich@uruk.org>
- *  Copyright (C) 1999  Free Software Foundation, Inc.
+ *  Copyright (C) 1999, 2000  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -64,6 +64,7 @@ find_command (char *command)
   ptr = command;
   while (*ptr && *ptr != ' ' && *ptr != '\t' && *ptr != '=')
     ptr ++;
+
   c = *ptr;
   *ptr = 0;
 
@@ -131,6 +132,10 @@ enter_cmdline (char *heap, int forever)
       if (get_cmdline (PACKAGE "> ", heap, 2048, 0, 1))
 	return;
 
+      /* If there was no command, grab a new one. */
+      if (! heap[0])
+	continue;
+
       /* Find a builtin.  */
       builtin = find_command (heap);
       if (! builtin)
diff --git a/stage2/common.c b/stage2/common.c
index cbf1b8822..c84571afc 100644
--- a/stage2/common.c
+++ b/stage2/common.c
@@ -50,18 +50,19 @@ grub_error_t errnum = ERR_NONE;
 char *err_list[] =
 {
   [ERR_NONE] = 0,
+  [ERR_BAD_ARGUMENT] = "Invalid argument",
   [ERR_BAD_FILENAME] =
-  "Bad filename (must be absolute pathname or blocklist)",
+  "Filename must be either an absolute pathname or blocklist",
   [ERR_BAD_FILETYPE] = "Bad file or directory type",
   [ERR_BAD_GZIP_DATA] = "Bad or corrupt data while decompressing file",
-  [ERR_BAD_GZIP_HEADER] = "Bad or incompatible header on compressed file",
+  [ERR_BAD_GZIP_HEADER] = "Bad or incompatible header in compressed file",
   [ERR_BAD_PART_TABLE] = "Partition table invalid or corrupt",
-  [ERR_BAD_VERSION] = "Bad or corrupt version of stage1/stage2",
+  [ERR_BAD_VERSION] = "Mismatched or corrupt version of stage1/stage2",
   [ERR_BELOW_1MB] = "Loading below 1MB is not supported",
-  [ERR_BOOT_COMMAND] = "Cannot boot without kernel loaded",
+  [ERR_BOOT_COMMAND] = "Kernel must be loaded before booting",
   [ERR_BOOT_FAILURE] = "Unknown boot failure",
   [ERR_BOOT_FEATURES] = "Unsupported Multiboot features requested",
-  [ERR_DEV_FORMAT] = "Device string unrecognizable",
+  [ERR_DEV_FORMAT] = "Unrecognized device string",
   [ERR_DEV_VALUES] = "Invalid device requested",
   [ERR_EXEC_FORMAT] = "Invalid or unsupported executable format",
   [ERR_FILELENGTH] =
@@ -70,20 +71,19 @@ char *err_list[] =
   [ERR_FSYS_CORRUPT] = "Inconsistent filesystem structure",
   [ERR_FSYS_MOUNT] = "Cannot mount selected partition",
   [ERR_GEOM] = "Selected cylinder exceeds maximum supported by BIOS",
-  [ERR_NEED_LX_KERNEL] = "Must load Linux kernel before initrd",
-  [ERR_NEED_MB_KERNEL] = "Must load Multiboot kernel before modules",
+  [ERR_NEED_LX_KERNEL] = "Linux kernel must be loaded before initrd",
+  [ERR_NEED_MB_KERNEL] = "Multiboot kernel must be loaded before modules",
   [ERR_NO_DISK] = "Selected disk does not exist",
   [ERR_NO_PART] = "No such partition",
   [ERR_NUMBER_PARSING] = "Error while parsing number",
   [ERR_OUTSIDE_PART] = "Attempt to access block outside partition",
+  [ERR_PRIVILEGED] = "Must be authenticated",
   [ERR_READ] = "Disk read error",
   [ERR_SYMLINK_LOOP] = "Too many symbolic links",
+  [ERR_UNALIGNED] = "File is not sector aligned",
   [ERR_UNRECOGNIZED] = "Unrecognized command",
   [ERR_WONT_FIT] = "Selected item cannot fit into memory",
   [ERR_WRITE] = "Disk write error",
-  [ERR_BAD_ARGUMENT] = "Invaild argument specified",
-  [ERR_UNALIGNED] = "File is not sector aligned",
-  [ERR_PRIVILEGED] = "Must be authenticated",
 };