Improved error messages

Line number and file name in error message.