diff --git a/ChangeLog b/ChangeLog
index b6d1f02cc..70e24ef15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/parser.c (grub_parser_split_cmdline): Don't dereference NULL.
+
 2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/menu_text.c (grub_print_message_indented): Prevent
diff --git a/kern/parser.c b/kern/parser.c
index 006d67da7..dd4608ba9 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -145,13 +145,16 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
   *argc = 0;
   do
     {
-      if (! *rd)
+      if (! rd || !*rd)
 	{
 	  if (getline)
 	    getline (&rd, 1);
 	  else break;
 	}
 
+      if (!rd)
+	break;
+
       for (; *rd; rd++)
 	{
 	  grub_parser_state_t newstate;