diff --git a/cli/src/main.c b/cli/src/main.c
index b59cdaf..7cb680a 100644
--- a/cli/src/main.c
+++ b/cli/src/main.c
@@ -87,6 +87,10 @@ static bool PidCmdArgParser(struct CmdArgs *args, const char *arg)
     FILE* pFile = NULL;
     pFile = fopen(pidMax, "r");
     if ((pFile == NULL) || (fgets(buff, PATH_MAX, pFile) == NULL)) {
+        if (pFile != NULL) {
+            (void)fclose(pFile);
+        }
+        pFile = NULL;
         Logger("failed to get pid_max buff.", LEVEL_ERROR, SCREEN_YES);
         return false;
     }
@@ -218,7 +222,7 @@ static bool MountFileCmdArgParser(struct CmdArgs *args, const char *arg)
         char* str = FormatLogMessage("too many files to mount, max number is %u", MAX_MOUNT_NR);
         Logger(str, LEVEL_ERROR, SCREEN_YES);
         free(str);
-        return -1;
+        return false;
     }
 
     char *dst = &args->files.list[args->files.count++][0];
@@ -252,7 +256,7 @@ static bool MountDirCmdArgParser(struct CmdArgs *args, const char *arg)
         char* str = FormatLogMessage("too many directories to mount, max number is %u", MAX_MOUNT_NR);
         Logger(str, LEVEL_ERROR, SCREEN_YES);
         free(str);
-        return -1;
+        return false;
     }
 
     char *dst = &args->dirs.list[args->dirs.count++][0];
diff --git a/cli/src/u_mount.c b/cli/src/u_mount.c
index db2bfcc..3afe5bc 100644
--- a/cli/src/u_mount.c
+++ b/cli/src/u_mount.c
@@ -117,7 +117,6 @@ static int GetDeviceMntSrcDst(const char *rootfs, const char *srcDeviceName,
 int MountDevice(const char *rootfs, const char *srcDeviceName, const char *dstDeviceName)
 {
     int ret;
-    char *str = NULL;
     char src[BUF_SIZE] = {0};
     char dst[BUF_SIZE] = {0};
     struct PathInfo pathInfo = {src, BUF_SIZE, dst, BUF_SIZE};
@@ -156,13 +155,12 @@ int MountDevice(const char *rootfs, const char *srcDeviceName, const char *dstDe
         Logger("failed to mount dev.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
-    free(str);
     return 0;
 }
 
 int DoDeviceMounting(const char *rootfs, const char *device_name, const unsigned int ids[], size_t idsNr)
 {
-    if (rootfs == NULL || device_name == NULL) {
+    if (rootfs == NULL || device_name == NULL || ids == NULL) {
         Logger("rootfs, device_name pointer is null!", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }