More work on bunny connection failure handling