diff --git a/api/api_storage.c b/api/api_storage.c
index d425a9ad1dbd7fce338e3065b294561c732a4120..b5aaba1091e6d875eadb8bc5289f27e9bf14a5aa 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -41,7 +41,7 @@ struct stor_spec {
 	char		*name;
 };
 
-static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
+static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
 
 
 void dev_stor_init(void)
@@ -105,6 +105,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 
 	struct blk_desc *dd;
 
+	/* Wasn't configured for this type, return 0 directly */
+	if (specs[type].name == NULL)
+		return 0;
+
 	if (first) {
 		di->cookie = (void *)blk_get_dev(specs[type].name, 0);
 		if (di->cookie == NULL)