diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
index bbb402a577..07ce0cef7f 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
@@ -514,8 +514,6 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      */
     public void actionPerformed(ActionEvent arg0) {
         
-        docConsole.setSaved(false);
-        
         if (arg0.getSource() == jButtonOk) {
             this.save();
             this.dispose();
@@ -549,6 +547,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             if (!dataValidation(row)) {
                 return;
             }
+            docConsole.setSaved(false);
             model.addRow(row);
             addRow(row);
         }
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
index 6d7c6d705f..3d29cf6d9d 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
@@ -128,7 +128,9 @@ public class SpdPackageDefinitions extends IInternalFrame {
             jComboBoxReadOnly.setSelectedIndex(1);
             jComboBoxReadOnly.addItemListener(new java.awt.event.ItemListener() {
                 public void itemStateChanged(java.awt.event.ItemEvent e) {
+                    if (docConsole != null) {
                     docConsole.setSaved(false);
+                    }
                     sfc.setSpdPkgDefsRdOnly(jComboBoxReadOnly.getSelectedItem()+"");
                 }
             });
@@ -151,7 +153,9 @@ public class SpdPackageDefinitions extends IInternalFrame {
             jComboBoxRePackage.setSelectedIndex(0);
             jComboBoxRePackage.addItemListener(new java.awt.event.ItemListener() {
                 public void itemStateChanged(java.awt.event.ItemEvent e) {
+                    if (docConsole != null) {
                     docConsole.setSaved(false);
+                    }
                     sfc.setSpdPkgDefsRePkg(jComboBoxRePackage.getSelectedItem()+"");
                 }
             });