added network and error messages support