diff --git a/ChangeLog b/ChangeLog
index 5fd92d3c7..b8fa36b67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-25  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* kern/env.c (grub_env_set): Check if ENV->VALUE instead of
+	ENV->NAME is NULL after	allocating ENV->VALUE.
+
 2005-12-25  Marco Gerards  <marco@gnu.org>
 
 	* kern/env.c (grub_env_set): Rewritten the error handling code.
diff --git a/kern/env.c b/kern/env.c
index f952422c8..29a2121ce 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -96,7 +96,7 @@ grub_env_set (const char *var, const char *val)
     goto fail;
   
   env->value = grub_strdup (val);
-  if (! env->name)
+  if (! env->value)
     goto fail;
   
   /* Insert it in the hashtable.  */