diff --git a/src/evmctl.c b/src/evmctl.c
index c999589..5f7c2b8 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -2629,7 +2629,12 @@ static char *get_password(void)
 		return NULL;
 	}
 
-	return pwd;
+	if (pwd == NULL) {
+		free(password);
+		return NULL;
+	}
+
+	return password;
 }
 
 int main(int argc, char *argv[])