Handle session comms better