2 files changed, 5 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 3b6a3c0dfa..2811fd1ba3 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -915,6 +915,8 @@ class DscParser(MetaFileParser):
             elif Line[0] == '!':
                 self._DirectiveParser()
                 continue
+            if Line[0] == TAB_OPTION_START and not self._InSubsection:
+                EdkLogger.error("Parser", FILE_READ_FAILURE, "Missing the '{' before %s in Line %s" % (Line, Index+1),ExtraData=self.MetaFile)
 
             if self._InSubsection:
                 SectionType = self._SubsectionType
diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index 34bc48a0d3..6c548ac709 100644
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -3012,10 +3012,9 @@ determine whether database file is out of date!\n")
         return PlatformList
 
     def _MapPlatform(self, Dscfile):
-        try:
-            Platform = self.BuildObject[PathClass(Dscfile), 'COMMON']
-        except:
-            Platform = None
+        Platform = self.BuildObject[PathClass(Dscfile), 'COMMON']
+        if Platform == None:
+            EdkLogger.error('build', PARSER_ERROR, "Failed to parser DSC file: %s" % Dscfile)
         return Platform
 
     PlatformList = property(_GetPlatformList)