diff --git a/ChangeLog b/ChangeLog
index 9e4ea21dd..6593c4891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/partmap/bsdlabel.c: Include grub/emu/misc.h and not grub/util/misc.h.
+	(iterate_real): Don't rely on partition being non-NULL.
+
 2011-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/script/argv.c (round_up_exp): unsigned is 32-bit on all
diff --git a/grub-core/partmap/bsdlabel.c b/grub-core/partmap/bsdlabel.c
index 09ecd935a..4dec3851c 100644
--- a/grub-core/partmap/bsdlabel.c
+++ b/grub-core/partmap/bsdlabel.c
@@ -26,7 +26,7 @@
 #include <grub/msdos_partition.h>
 
 #ifdef GRUB_UTIL
-#include <grub/util/misc.h>
+#include <grub/emu/misc.h>
 #endif
 
 static struct grub_partition_map grub_bsdlabel_partition_map;
@@ -101,7 +101,8 @@ iterate_real (grub_disk_t disk, grub_disk_addr_t sector, int freebsd,
 #ifdef GRUB_UTIL
 	  char *partname;
 	  /* disk->partition != NULL as 0 < delta */
-	  partname = grub_partition_get_name (disk->partition);
+	  partname = disk->partition ? grub_partition_get_name (disk->partition)
+	    : "";
 	  grub_util_warn ("Discarding improperly nested partition (%s,%s,%s%d)",
 			  disk->name, partname, p.partmap->name, p.number + 1);
 	  grub_free (partname);