Fix for #520, moving towards refactoring whois.