diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index d39114f50e..e1aadb845d 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -118,6 +118,7 @@ InternalShellProtocolDebugPrintMessage (
   EFI_STATUS                        Status;
   CHAR16                            *Temp;
 
+  Status = EFI_SUCCESS;
   DEBUG_CODE_BEGIN();
 
   if (Mapping != NULL) {
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index 87f2383fad..73831d267e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -525,6 +525,7 @@ BcfgAddDebug1(
 
       CopyMem (TempByteBuffer, Desc, DescSize);
       TempByteBuffer += DescSize;
+      ASSERT (FilePath != NULL);
       CopyMem (TempByteBuffer, FilePath, FilePathSize);
 
       UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);
diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
index 390f1b6da9..543ae376e9 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
@@ -523,6 +523,7 @@ BcfgAddInstall1(
 
       CopyMem (TempByteBuffer, Desc, DescSize);
       TempByteBuffer += DescSize;
+      ASSERT (FilePath != NULL);
       CopyMem (TempByteBuffer, FilePath, FilePathSize);
 
       UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);