Better handling for connection drops.