Fixed switch callback propagation and improved handling of some network errors