Index: Library/UefiShellLevel2CommandsLib/Cp.c
===================================================================
--- Library/UefiShellLevel2CommandsLib/Cp.c	(revision 16160)
+++ Library/UefiShellLevel2CommandsLib/Cp.c	(working copy)
@@ -326,7 +326,9 @@
     } 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...
Index: Library/UefiShellLevel2CommandsLib/Mv.c
===================================================================
--- Library/UefiShellLevel2CommandsLib/Mv.c	(revision 16160)
+++ Library/UefiShellLevel2CommandsLib/Mv.c	(working copy)
@@ -289,6 +289,8 @@
     }
   }  
 
+  ASSERT (CleanFilePathStr != NULL);
+
   //
   // Get and validate the destination location
   //