Cleanup chunks only when rescuing from an error - pull request 9