Better peer identification

If you fail to add the hostname to list here, it's better IMO if you fail the whole the command. If we return success here, the user will be misled.