diff --git a/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java b/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java
index 5f7450f1470a23e3ef59167957931d5a9ff99576..1e2293d040eaddd57ea14a21edec8f6f20aedbe4 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java
@@ -31,7 +31,7 @@ public class ExcelRowTokenizer implements ILineTokenizer<Row>
     {
     }
 
-    public String[] tokenize(Row row) throws ParsingException
+    public String[] tokenize(Row row) throws ParserException
     {
         return tokenizeRow(row);
     }
@@ -48,7 +48,7 @@ public class ExcelRowTokenizer implements ILineTokenizer<Row>
         return line;
     }
 
-    private static String extractCellValue(Cell cell) throws ParsingException
+    private static String extractCellValue(Cell cell) throws ParserException
     {
         switch (cell.getCellType())
         {
@@ -65,13 +65,9 @@ public class ExcelRowTokenizer implements ILineTokenizer<Row>
                         "Excel formulas are not supported but one was found in cell "
                                 + extractCellPosition(cell));
             case Cell.CELL_TYPE_ERROR:
-                throw new ParsingException(new String[]
-                    { "There is an error in cell " + extractCellPosition(cell) },
-                        cell.getRowIndex());
+                throw new ParserException("There is an error in cell " + extractCellPosition(cell));
             default:
-                throw new ParsingException(new String[]
-                    { "Unknown data type of cell " + extractCellPosition(cell) },
-                        cell.getRowIndex());
+                throw new ParserException("Unknown data type of cell " + extractCellPosition(cell));
         }
     }
 
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java b/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java
index 5999199923fd42b846b547b60e92d570aa46e8ed..c4d3d0e2868fb949d0835a1583909d07a89a7203 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java
@@ -34,7 +34,7 @@ public interface ILineTokenizer<T>
     public void init();
 
     /** Splits given <code>line</code> into an array of tokens. */
-    public String[] tokenize(T line) throws ParsingException;
+    public String[] tokenize(T line) throws ParserException;
 
     /**
      * Cleans up resources used by this <code>ILineTokenizer</code>.