diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
index a5d20cfcfb..82022bea60 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
@@ -54,7 +54,7 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
 		if(ArrayUtils.isNotEmpty(colNames)){
 			return toColumnNameList(colNames);
 		} else if (ArrayUtils.isNotEmpty(colNamesInCache)) {
-			return toColumnNameList(colNames);
+			return toColumnNameList(colNamesInCache);
 		}
 		
 		EmbeddedTableData embeddedTableData = null;
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index e66515fe9a..6d9dc3b619 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -1141,8 +1141,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             Thread.currentThread().interrupt();
         }
 
-        DesignerEnvManager.getEnvManager().setLastOpenFile(
-                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+        JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jt != null)  {
+            DesignerEnvManager.getEnvManager().setLastOpenFile(jt.getEditingFILE().getPath());
+        }
 
         DesignerEnvManager.getEnvManager().setLastWestRegionToolPaneY(
                 WestRegionContainerPane.getInstance().getToolPaneY());