Better handle session reconnects