Include line number in error
Split off line verification