REPORT-66884

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

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