Improve error hanlding for some old urls.