Better connectivity problem handling