Add item position in source text
Better error messages