Changed exception handling for test
Merge branch 'upstream-rdap' of github.com:APNIC-net/whois into upstream-rdap
Patched due to bamboo failing