diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c
index b1e8cbb1..dbf792b7 100644
--- a/src/usr/imgmgmt.c
+++ b/src/usr/imgmgmt.c
@@ -154,7 +154,8 @@ int imgdownload ( struct uri *uri, const char *name, const char *cmdline,
 		return -ENOMEM;
 
 	/* Set image name */
-	image_set_name ( image, name );
+	if ( name )
+		image_set_name ( image, name );
 
 	/* Set image URI */
 	image_set_uri ( image, uri );