Better disconnection/reconnection handling