Index: Library/UefiShellLevel2CommandsLib/Cp.c
===================================================================
--- Library/UefiShellLevel2CommandsLib/Cp.c	(revision 16159)
+++ Library/UefiShellLevel2CommandsLib/Cp.c	(working copy)
@@ -320,7 +320,7 @@
 
   
   Status = ShellLevel2StripQuotes (DestDir, &CleanFilePathStr);
-  if (EFI_ERROR (Status)) {
+  if (EFI_ERROR (Status) || CleanFilePathStr == NULL) {
     if (Status == EFI_OUT_OF_RESOURCES) {
       return SHELL_OUT_OF_RESOURCES;
     } else {
Index: Library/UefiShellLevel2CommandsLib/Mv.c
===================================================================
--- Library/UefiShellLevel2CommandsLib/Mv.c	(revision 16159)
+++ Library/UefiShellLevel2CommandsLib/Mv.c	(working copy)
@@ -281,7 +281,7 @@
   CleanFilePathStr = NULL;
 
   Status = ShellLevel2StripQuotes (DestDir, &CleanFilePathStr);
-  if (EFI_ERROR (Status)) {
+  if (EFI_ERROR (Status) || CleanFilePathStr == NULL) {
     if (Status == EFI_OUT_OF_RESOURCES) {
       return SHELL_OUT_OF_RESOURCES;
     } else {