Improve handling of unverified domain #6