don't fail on trying to clean up (bug 964784)
Merge pull request #1700 from andymckay/964784

don't fail on trying to clean up (bug 964784)