diff --git a/ChangeLog b/ChangeLog
index 719fc732b..5fd92d3c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-25  Marco Gerards  <marco@gnu.org>
+
+	* kern/env.c (grub_env_set): Rewritten the error handling code.
+
 2005-12-25  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* geninit.sh: Made more robust, and more portable.
diff --git a/kern/env.c b/kern/env.c
index 449275f23..f952422c8 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -123,15 +123,14 @@ grub_env_set (const char *var, const char *val)
     sort->sort_prevp = &env->sort_next;
   *sortp = env;
 
- fail:
-  if (grub_errno)
-    {
-      grub_free (env->name);
-      grub_free (env->value);
-      grub_free (env);
-    }
-  
   return 0;
+
+ fail:
+  grub_free (env->name);
+  grub_free (env->value);
+  grub_free (env);
+
+  return grub_errno;
 }
 
 char *