Fixing the code so that extra information (like line number) can be included.