diff --git a/ChangeLog b/ChangeLog
index f1ac4cdfd..86f667f50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/zfs/zfs.c (nvlist_find_value): Fix return value.
+
 2012-05-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix reiserfs big seek times.
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index a3486ef9b..ba0554abd 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -3113,7 +3113,10 @@ nvlist_find_value (const char *nvlist_in, const char *name,
 
       nelm = grub_be_to_cpu32 (grub_get_unaligned32 (nvpair));
       if (nelm < 1)
-	return grub_error (GRUB_ERR_BAD_FS, "empty nvpair");
+	{
+	  grub_error (GRUB_ERR_BAD_FS, "empty nvpair");
+	  return 0;
+	}
 
       nvpair += 4;