diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
index 351dfd5913..66b9d2bb2d 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -572,9 +572,9 @@ BdsLibBuildOptionFromVar (
     }
 
     Option              = BdsLibVariableToOption (BdsCommonOptionList, OptionName);
-    ASSERT (Option != NULL);
-    Option->BootCurrent = OptionOrder[Index];
-
+    if (Option != NULL) {
+      Option->BootCurrent = OptionOrder[Index];
+    }
   }
 
   FreePool (OptionOrder);