Both #268 and #269 require more logging because I only happens sometimes. This adds a bit more logging to the cleanup where some of the failures seem to be.