1 files changed, 8 insertions, 2 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 86046081fe..6f153d0c3f 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -359,12 +359,18 @@ CallDeviceManager (
     }
 
     String = HiiGetString (HiiHandles[Index], FormSetTitle, NULL);
-    ASSERT (String != NULL);
+    if (String == NULL) {
+      String = HiiGetString (HiiHandle, STR_MISSING_STRING, NULL);
+      ASSERT (String != NULL);
+    }
     Token = HiiSetString (HiiHandle, 0, String, NULL);
     FreePool (String);
 
     String = HiiGetString (HiiHandles[Index], FormSetHelp, NULL);
-    ASSERT (String != NULL);
+    if (String == NULL) {
+      String = HiiGetString (HiiHandle, STR_MISSING_STRING, NULL);
+      ASSERT (String != NULL);
+    }
     TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);
     FreePool (String);