Fix to better handle non existing domains.