Show line number in error message

Also fix pep8 issues.

Change-Id: I064886c36a9ac2cc7c659f8b1650ce6c9e817ec2
Merge "Show line number in error message"