diff --git a/common/blspec.c b/common/blspec.c
index b258e66..6171461 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -107,7 +107,8 @@
 	}
 
 	pr_info("booting %s from %s\n", blspec_entry_var_get(entry, "title"),
-			entry->cdev ? dev_name(entry->cdev->dev) : "none");
+			(entry->cdev && entry->cdev->dev) ?
+			dev_name(entry->cdev->dev) : "none");
 
 	ret = bootm_boot(&data);
 	if (ret)
@@ -505,7 +506,7 @@
 
 		found++;
 
-		if (entry->cdev) {
+		if (entry->cdev && entry->cdev->dev) {
 			devname = xstrdup(dev_name(entry->cdev->dev));
 			if (entry->cdev->dev->parent)
 				hwdevname = xstrdup(dev_name(entry->cdev->dev->parent));