More correctly handle too many redirects on resolve