diff --git a/Library/OcConsoleLib/OcConsoleLib.c b/Library/OcConsoleLib/OcConsoleLib.c
index c24e9f85..fae624f6 100644
--- a/Library/OcConsoleLib/OcConsoleLib.c
+++ b/Library/OcConsoleLib/OcConsoleLib.c
@@ -357,9 +357,12 @@ ParseResolution (
 
   *Width  = 0;
   *Height = 0;
-  *Bpp    = 0;
   *Max    = FALSE;
 
+  if (Bpp != NULL) {
+    *Bpp    = 0;
+  }
+
   if (AsciiStrCmp (String, "Max") == 0) {
     *Max = TRUE;
     return;