Tweaking error handling and reporting
Minor filename tweak