Merge pull request #92 from jfallows/develop

Avoid stack overflow when exception occurs during close.