2 files changed, 7 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/Common/BuildVersion.py b/BaseTools/Source/Python/Common/BuildVersion.py
index c5dae6daa4..0323fafa3c 100644
--- a/BaseTools/Source/Python/Common/BuildVersion.py
+++ b/BaseTools/Source/Python/Common/BuildVersion.py
@@ -13,4 +13,4 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 
-gBUILD_VERSION = "Build 2518"
+gBUILD_VERSION = "Build 2524"
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index a4853b78a4..80fad7563d 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -256,9 +256,12 @@ class ValueExpression(object):
             if self.__IsNumberToken():
                 return self._Expr
 
-            Token = self._GetToken()
-            if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
-                return self._Expr
+            try:
+                Token = self._GetToken()
+                if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
+                    return self._Expr
+            except BadExpression:
+                pass
 
             self._Idx = 0
             self._Token = ''