Catch network errors, improuve update and response logic