diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index fa5f5af0e2..22e9ef5fc0 100644
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -940,7 +940,7 @@ class InfPomAlignment(ModuleObject):
                     HelpTextObj.SetString(CommentItem.GetHelpStringItem())
                     Pcd.SetHelpTextList(Pcd.GetHelpTextList() + [HelpTextObj])
                 AsBuildPatchPcdList.append(Pcd)
-            else:
+            elif PcdItem[0].upper() == DT.TAB_INF_PCD_EX.upper():
                 PcdItemObj = PcdItem[1]
                 Pcd = CommonObject.PcdObject()
                 Pcd.SetTokenSpaceGuidValue(PcdItemObj.GetTokenSpaceGuidValue())
diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index d117468a17..4dc1c7edab 100644
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -160,7 +160,7 @@ class BinaryFileXml(object):
 
         GuiVerElemList = []
         for LibGuidVer in LibGuidVerList:
-            if IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):
+            if LibGuidVer.GetLibGuid() and IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):
                 GuiVerElem = \
                 CreateXmlElement('GUID', LibGuidVer.GetLibGuid(), [], [['Version', LibGuidVer.GetLibVersion()]])
                 GuiVerElemList.append(GuiVerElem)