diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 2b0fb2346b..73db7de4f4 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -41,7 +41,6 @@ import org.tianocore.build.id.ModuleIdentification;
 import org.tianocore.build.id.PlatformIdentification;
 import org.tianocore.build.pcd.action.ActionMessage;
 import org.tianocore.build.pcd.action.CollectPCDAction;
-import org.tianocore.build.pcd.exception.EntityException;
 import org.tianocore.build.toolchain.ToolChainAttribute;
 import org.tianocore.build.toolchain.ToolChainElement;
 import org.tianocore.build.toolchain.ToolChainMap;
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index c2918b7b3b..0dcc80c926 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -1316,7 +1316,9 @@ public class SurfaceAreaQuery {
             //
             // Get Fpd SA Module attribute and create FpdMoudleIdentification.
             //
-            arch = moduleSA.getSupArchList().toString();
+            if (moduleSA.getSupArchList() != null) {
+                arch = moduleSA.getSupArchList().toString();
+            }
 
             // TBD
             fvBinding = null;
@@ -1342,21 +1344,25 @@ public class SurfaceAreaQuery {
             // Create FpdModule Identification which have class member of module
             // identification
             //
-            if (arch != null) {
-                String[] archList = arch.split(" ");
-                for (int j = 0; j < archList.length; j++) {
-                    FpdModuleIdentification fpdSaId = new FpdModuleIdentification(saId,    archList[j]);
-        
-                    if (fvBinding != null) {
-                        fpdSaId.setFvBinding(fvBinding);
-                    }
-        
-                    //
-                    // Put element to Map<FpdModuleIdentification, Map<String,
-                    // Object>>.
-                    //
-                    fpdModuleMap.put(fpdSaId, ObjectMap);
+            String[] archList = new String[0];
+            if (arch == null || arch.trim().length() == 0) {
+                archList = GlobalData.getToolChainInfo().getArchs();
+            }
+            else{
+                archList = arch.split(" ");
+            }
+            for (int j = 0; j < archList.length; j++) {
+                FpdModuleIdentification fpdSaId = new FpdModuleIdentification(saId,    archList[j]);
+    
+                if (fvBinding != null) {
+                    fpdSaId.setFvBinding(fvBinding);
                 }
+    
+                //
+                // Put element to Map<FpdModuleIdentification, Map<String,
+                // Object>>.
+                //
+                fpdModuleMap.put(fpdSaId, ObjectMap);
             }
         }
         return fpdModuleMap;