Add a useful error message in case of an invalid hostname
Merge remote-tracking branch 'gh/next'