Add filename on error. Issue #4