Added protection to not found hostname