Fixed arg checking for dns client
Merge branch 'master' into wip