diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c b/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
index ff33e91b3b..48cc1ab146 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
@@ -206,7 +206,6 @@ PeCoffGetPdbPath (
       break;
 
     default:
-      DEBUG_RAISE ();
       return RETURN_UNSUPPORTED;
   }
   //
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c b/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
index 8ea6a77079..ed432de4b9 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
@@ -68,6 +68,7 @@ InternalVerifySections (
   // Images without Sections have no usable data, disallow them.
   //
   if (Context->NumberOfSections == 0) {
+    DEBUG_RAISE ();
     return RETURN_VOLUME_CORRUPTED;
   }
 
@@ -274,7 +275,7 @@ InternalValidateRelocInfo (
   //
   // If the Base Relocations have not been stripped, verify their Directory.
   //
-  if (!Context->RelocsStripped && Context->RelocDirSize != 0) {
+  if (Context->RelocDirSize != 0) {
     //
     // Verify the Relocation Directory is not empty.
     //