diff --git a/src/container.c b/src/container.c
index a7eae46e..1e87b057 100644
--- a/src/container.c
+++ b/src/container.c
@@ -525,6 +525,7 @@ static int hyper_container_init(void *data)
 
 		if (container->scsiaddr) {
 			free(container->image);
+			container->image = NULL;
 			hyper_find_sd(container->scsiaddr, &container->image);
 		}
 
diff --git a/src/util.c b/src/util.c
index 307789aa..5a8bea46 100644
--- a/src/util.c
+++ b/src/util.c
@@ -134,7 +134,6 @@ int hyper_find_sd(char *addr, char **dev)
 		}
 
 		fprintf(stdout, "%s get %s\n", path, dir->d_name);
-		free(*dev);
 		*dev = strdup(dir->d_name);
 		break;
 	}