Improve Bunny connection handling