diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index b59d3420c2..cca9738a11 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -1175,8 +1175,8 @@ public class FpdFileContents {
                 //
                 // ToDo Error 
                 //
-                throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " in Module "
-                                          + mi.getName());
+                throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " used by Module "
+                                          + mi.getName() + " or its Library Instances.");
             }
             //
             // AddItem to ModuleSA PcdBuildDefinitions
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index 00243c2460..75f7474a02 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -852,6 +852,9 @@ public class FpdFrameworkModules extends IInternalFrame {
     public FpdFrameworkModules(OpeningPlatformType opt) {
         this(opt.getXmlFpd());
         docConsole = opt;
+        if (pcdSync()) {
+            JOptionPane.showMessageDialog(frame, "PCD in this platform are synchronized with those in MSA files.");    
+        }
     }
 
     private void init(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {
@@ -910,9 +913,26 @@ public class FpdFrameworkModules extends IInternalFrame {
         }
 
         showAllModules();
-
+        
     }
 
+    private boolean pcdSync() {
+        boolean synced = false;
+        for (int i = 0; i < jTableFpdModules.getRowCount(); ++i) {
+            try {
+                if (ffc.adjustPcd(i)) {
+                    synced = true;
+                }
+            }
+            catch (Exception exp) {
+                JOptionPane.showMessageDialog(frame, exp.getMessage());
+                continue;
+            }
+        }
+        return synced;
+        
+    }
+    
     private void showAllModules() {
 
         if (miList == null) {