diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 39384c45ba..0b16e30df3 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -1382,7 +1382,7 @@ public class SurfaceAreaQuery {
         String[] xPath = new String[] { "/UserExtensions" };
 
         Object[] queryResult = get("PlatformSurfaceArea", xPath);
-        if (queryResult == null && queryResult.length == 0) {
+        if (queryResult == null || queryResult.length == 0) {
             return null;
         }
         UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];