Handle any exception in closing a channel inside of the exception
handler.
Fix several tests