Error messages and filenames improved.