Ensure guardfiles are removed even when an exception is raised
Merge pull request #843 from uhlenbrock/ensure-guardfile-cleanup

Ensure guardfiles are removed even when an exception is raised