More robust for http errors