Improved error collector. Fixed using line parameter.