diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
index 63a7a7950e..93a50c467a 100644
--- a/plugins/micron/micron-nvme.c
+++ b/plugins/micron/micron-nvme.c
@@ -319,7 +319,8 @@ static int SetupDebugDataDirectories(char *strSN, char *strFilePath,
 	if (strOSDirName) {
 		sprintf(strOSDirName, "%s/%s", strMainDirName, "OS");
 		if (mkdir(strOSDirName, 0777) < 0) {
-			rmdir(strMainDirName);
+			if (strMainDirName)
+				rmdir(strMainDirName);
 			err = -1;
 			goto exit_status;
 		}
@@ -329,9 +330,10 @@ static int SetupDebugDataDirectories(char *strSN, char *strFilePath,
 		if (mkdir(strCtrlDirName, 0777) < 0) {
 			if (strOSDirName)
 				rmdir(strOSDirName);
-			rmdir(strMainDirName);
+			if (strMainDirName)
+				rmdir(strMainDirName);
 			err = -1;
-	}
+		}
 	}
 
 exit_status: