Merge pull request #456 from norv/cleanups

Cleanups
File name wasn't displayed for errors on invalid files.

Signed-off-by: Norv <a.w.norv@gmail.com>