diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index af00fe401d..fc13595dbb 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -1632,6 +1632,8 @@ EfiShellExecute(
   EFI_DEVICE_PATH_PROTOCOL  *DevPath;
   UINTN                     Size;
   EFI_STATUS                CalleeStatusCode;
+
+  CalleeStatusCode = EFI_SUCCESS;
   
   if ((PcdGet8(PcdShellSupportLevel) < 1)) {
     return (EFI_UNSUPPORTED);
diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
index 02099febef..831b9c3d02 100644
--- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
@@ -341,6 +341,7 @@ ShellCommandRunTftp (
   }
 
   RemoteFilePath = ShellCommandLineGetRawValue (CheckPackage, 2);
+  ASSERT(RemoteFilePath != NULL);
   AsciiRemoteFilePath = AllocatePool (
                           (StrLen (RemoteFilePath) + 1) * sizeof (CHAR8)
                           );