Handle 401 and new URL structures.