2 files changed, 2 insertions, 4 deletions
diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 55cf3c279e..91a0f5f8a2 100644
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -1040,7 +1040,7 @@ UpdateStdInStdOutStdErr(
             TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);
           }
           Size = 0;
-          if (((EFI_FILE_PROTOCOL*)TempHandle)->Read(TempHandle, &Size, NULL) != EFI_BUFFER_TOO_SMALL) {
+          if (TempHandle != NULL || ((EFI_FILE_PROTOCOL*)TempHandle)->Read(TempHandle, &Size, NULL) != EFI_BUFFER_TOO_SMALL) {
             Status = EFI_INVALID_PARAMETER;
           } else {
             ShellParameters->StdIn = TempHandle;
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 6b81918101..00bbc358fa 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -2249,9 +2249,7 @@ EfiShellFindFiles(
   MapName = StrnCatGrow(&MapName, NULL, PatternCopy, Count);
   if (MapName == NULL) {
     Status = EFI_OUT_OF_RESOURCES;
-  }
-
-  if (!EFI_ERROR(Status)) {
+  } else {
     RootDevicePath = EfiShellGetDevicePathFromFilePath(PatternCopy);
     if (RootDevicePath == NULL) {
       Status = EFI_INVALID_PARAMETER;