make redirector more robust