diff --git a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java
index 0f1c50a5f..29b1a3ea0 100644
--- a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java
+++ b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java
@@ -36,15 +36,18 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 
 			@Override
 			public void itemStateChanged(ItemEvent e) {
-                //这边需要重新初始化columnNames, 否则nameList长度和columnNames长度不同导致出錯。
-                List<String> nameList = tableDataComboBox.getSelectedItem().calculateColumnNameList();
-                columnNames = new String[nameList.size()];
-				columnNames = tableDataComboBox.getSelectedItem().calculateColumnNameList().toArray(columnNames);
-				columnNameComboBox.removeAllItems();
-				for (int i = 0; i < columnNames.length; i++) {
-					columnNameComboBox.addItem(columnNames[i]);
+				TableDataWrapper tableDataWrapper = tableDataComboBox.getSelectedItem();
+				if (tableDataWrapper != null) {
+					//这边需要重新初始化columnNames, 否则nameList长度和columnNames长度不同导致出錯。
+					List<String> nameList = tableDataComboBox.getSelectedItem().calculateColumnNameList();
+					columnNames = new String[nameList.size()];
+					columnNames = tableDataComboBox.getSelectedItem().calculateColumnNameList().toArray(columnNames);
+					columnNameComboBox.removeAllItems();
+					for (int i = 0; i < columnNames.length; i++) {
+						columnNameComboBox.addItem(columnNames[i]);
+					}
+					columnNameComboBox.validate();
 				}
-				columnNameComboBox.validate();
 			}
 		});
 		columnNameComboBox = new UIComboBox();