Handle DNS errors sensibly
Merge pull request #202 from Metaswitch/handle-dns-errors

Reviewer Mike - Handle DNS errors sensibly