Report filename if available in case of errors
Merge pull request #59 from andreypopp/master

Report filename if available in case of errors