diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
index e920432..eaf0582 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
@@ -724,8 +724,10 @@ namespace AIStudio.Wpf.DiagramDesigner
                     else
                     {
                         itemBase = Activator.CreateInstance(dragObject.ContentType) as DesignerItemViewModelBase;
-                        itemBase.Text = dragObject.Text;
-                        itemBase.Icon = dragObject.Icon;
+                        if (!string.IsNullOrEmpty(dragObject.Text))
+                            itemBase.Text = dragObject.Text;
+                        if (!string.IsNullOrEmpty(dragObject.Icon))
+                            itemBase.Icon = dragObject.Icon;
                         itemBase.ColorViewModel = CopyHelper.Mapper(dragObject.ColorViewModel);
                         if (dragObject.DesiredSize != null)
                         {
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
index f7142ff..59f1a67 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
@@ -637,7 +637,8 @@ namespace AIStudio.Wpf.DiagramDesigner
             if (!Connectors.Contains(connector))
             {
                 Connectors.Add(connector);
-                ConnectorMargin = 0 - connector.ConnectorWidth / 2;
+                if (!double.IsNaN(connector.ConnectorWidth))
+                    ConnectorMargin = 0 - connector.ConnectorWidth / 2;
             }
         }