diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
index 618c2edec2..2e605cafcf 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
@@ -292,7 +292,6 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             }
             tds.putTableData(tdName, td);
         }
-        tc.fireTargetModified();
         tc.parameterChanged();
         dataTree.refresh();
     }
diff --git a/designer_form/src/com/fr/design/mainframe/CoverReportPane.java b/designer_form/src/com/fr/design/mainframe/CoverReportPane.java
index 42dc62040c..63ec66f5a5 100644
--- a/designer_form/src/com/fr/design/mainframe/CoverReportPane.java
+++ b/designer_form/src/com/fr/design/mainframe/CoverReportPane.java
@@ -62,15 +62,17 @@ public class CoverReportPane extends JPanel {
         editButton.setBackground(new Color(176, 196, 222));
         add(editButton);
         add(controlButton);
-        WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
-            @Override
-            public void fireCreatorModified(DesignerEvent evt) {
-                if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
-                        || evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
-                    destroyHelpDialog();
+        if (WidgetPropertyPane.getInstance().getEditingFormDesigner() != null) {
+            WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
+                @Override
+                public void fireCreatorModified(DesignerEvent evt) {
+                    if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
+                            || evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
+                        destroyHelpDialog();
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     public String getHelpMsg() {