Merge pull request #1380 from rubenk/csv-plug-leak-on-error-path