Only attempt to replace bad hosts if they exist and small increases in logging