Reworked handling disconnect / reconnect problems for improved stability