diff --git a/ChangeLog b/ChangeLog
index 1e1dbb34a..ebd7ce7cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Add
+	TRANSLATORS comment.
+	(grub_diskfilter_print_partmap): Propagate changing of error into
+	warning.
+
 2012-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/diskfilter.h (grub_diskfilter_vg): Increase extent_size
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index 0a343db6b..06cc7e75f 100644
--- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c
@@ -297,6 +297,11 @@ grub_diskfilter_memberlist (grub_disk_t disk)
     {
       if (!pv->disk)
 	{
+	  /* TRANSLATORS: This message kicks in during the detection of
+	     which modules needs to be included in core image. This happens
+	     in the case of degraded RAID and means that autodetection may
+	     fail to include some of modules. It's an installation time
+	     message, not runtime message.  */
 	  grub_util_warn (_("Couldn't find physical volume `%s'."
 			    " Some modules may be missing from core image."),
 			  pv->name);
@@ -322,8 +327,17 @@ grub_diskfilter_print_partmap (grub_disk_t disk)
       {
 	grub_size_t s;
 	if (!pv->disk)
-	  grub_util_error (_("Couldn't find physical volume `%s'."
-			     " Check your device.map"), pv->name);
+	  {
+	    /* TRANSLATORS: This message kicks in during the detection of
+	       which modules needs to be included in core image. This happens
+	       in the case of degraded RAID and means that autodetection may
+	       fail to include some of modules. It's an installation time
+	       message, not runtime message.  */
+	    grub_util_warn (_("Couldn't find physical volume `%s'."
+			      " Some modules may be missing from core image."),
+			    pv->name);
+	    continue;
+	  }
 	for (s = 0; pv->partmaps[s]; s++)
 	  grub_printf ("%s ", pv->partmaps[s]);
       }