diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 63808424b0..a576f83446 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -326,7 +326,9 @@ ValidateAndCopyFiles(
     } else {
       return SHELL_INVALID_PARAMETER;
     }
-  }  
+  }
+  
+  ASSERT (CleanFilePathStr != NULL);
 
   //
   // If we are trying to copy multiple files... make sure we got a directory for the target...
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index 772cbd27f1..666cedb49d 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -289,6 +289,8 @@ ValidateAndMoveFiles(
     }
   }  
 
+  ASSERT (CleanFilePathStr != NULL);
+
   //
   // Get and validate the destination location
   //