Improve connection handling in bus connection wrapper.