Yet another regex fix + test case for DNS failures