diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 283d9be358..ea8c7d5157 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -415,6 +415,8 @@ Returns:
     if (EFI_ERROR (Status)) {
       return EFI_UNSUPPORTED;
     }
+  } else {
+    return EFI_UNSUPPORTED;
   }
 
   Instance = 0;
diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index e944217028..cccbc6b06f 100644
--- a/MdeModulePkg/Library/GraphicsLib/Graphics.c
+++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c
@@ -470,6 +470,8 @@ Returns:
     if (EFI_ERROR (Status)) {
       return EFI_UNSUPPORTED;
     }
+  } else {
+    return EFI_UNSUPPORTED;
   }
 
   Instance = 0;
@@ -607,6 +609,8 @@ Returns:
                             Height,
                             Width * sizeof (EFI_UGA_PIXEL)
                             );
+      } else {
+      Status = EFI_UNSUPPORTED;
       }
     }
 
diff --git a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
index 002b8302c3..fe167e0199 100644
--- a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -152,6 +152,8 @@ Returns:
                           SizeOfY - (PosY - GLYPH_HEIGHT - 1),
                           SizeOfX * sizeof (EFI_UGA_PIXEL)
                           );
+    } else {
+      return EFI_UNSUPPORTED;
     }
   }
   //
@@ -185,6 +187,8 @@ Returns:
                           BlockHeight,
                           (BlockWidth) * sizeof (EFI_UGA_PIXEL)
                           );
+    } else {
+      return EFI_UNSUPPORTED;
     }
   }
 
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 48c5c1bbed..2cf2f3e64d 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -424,6 +424,9 @@ GraphicsConsoleControllerDriverStart (
           goto Error;
         }
       }
+    } else {
+      Status = EFI_UNSUPPORTED;
+      goto Error;
     }
   }