REPORT-66884

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -1991,6 +1991,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     }
 
     public void instantiateCreator(XCreator creator) {
+        if (creator != null) {
             ModelUtil.renameWidgetName(this.getTarget(), creator);
             creator.addNotify();
 
@@ -1998,11 +1999,14 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             adapter.initialize();
             creator.putClientProperty(AdapterBus.CLIENT_PROPERTIES, adapter);
         }
+    }
 
     public void backUpCreator(XCreator creator) {
+        if (creator != null) {
             creator.backupCurrentSize();
             creator.backupParent();
         }
+    }
 
     public void addWidgetToForm(XCreator creator, int x, int y) {
         if(creator == null) {