Use different URLs, improved error handling.