Better connection handling.