diff --git a/main/src/com/google/refine/importers/ImportingParserBase.java b/main/src/com/google/refine/importers/ImportingParserBase.java index 400df3fdc..b36c452d2 100644 --- a/main/src/com/google/refine/importers/ImportingParserBase.java +++ b/main/src/com/google/refine/importers/ImportingParserBase.java @@ -164,16 +164,20 @@ abstract public class ImportingParserBase implements ImportingParser { protected static int addFilenameColumn(Project project) { String fileNameColumnName = "File"; - assert project.columnModel.getColumnByName(fileNameColumnName) == null; - try { - project.columnModel.addColumn( - 0, new Column(project.columnModel.allocateNewCellIndex(), fileNameColumnName), false); + if (project.columnModel.getColumnByName(fileNameColumnName) == null) { + try { + project.columnModel.addColumn( + 0, new Column(project.columnModel.allocateNewCellIndex(), fileNameColumnName), false); + + return 0; + } catch (ModelException e) { + // Shouldn't happen: We already checked for duplicate name. + logger.error("ModelException adding Filename column",e); + } + return -1; + } else { return 0; - } catch (ModelException e) { - // Shouldn't happen: We already checked for duplicate name. - logger.error("ModelException adding Filename column",e); } - return -1; } }