Handle network events more cleanly, everything's working fine !