Add check for a hostname if none is specified