More work
Do not swallow close exceptions
Add log prefix removal