handle if hostlist is not there
Merge remote-tracking branch 'origin/master'