diff --git a/linkcheck/checker/tests/data/misc.html b/linkcheck/checker/tests/data/misc.html
index be9d2ac1..ff8ed847 100644
--- a/linkcheck/checker/tests/data/misc.html
+++ b/linkcheck/checker/tests/data/misc.html
@@ -3,5 +3,8 @@
 <meta rel="SHORTCUT ICON" href="favicon.ico">
 <meta rel="ICON" href="favicon.ico">
 
+<!-- unparsable domain name -->
+<a href="http://imadoofus.org%0D%3Cfont%20face=%22Verdana,%20Arial,%20Helvetica,%20sans-serif%22%20size=%222%22%3E%3Chttp://www.imadoofus.org%3E%20%0D%20%20%20%20%20%20%20%20%20%20%20%20%20%20">blubb</a>
+
 <!-- empty tag -->
 <tr background>
diff --git a/linkcheck/checker/tests/data/misc.html.result b/linkcheck/checker/tests/data/misc.html.result
index 3c14e439..42a22e88 100644
--- a/linkcheck/checker/tests/data/misc.html.result
+++ b/linkcheck/checker/tests/data/misc.html.result
@@ -18,6 +18,12 @@ cache key file://%(curdir)s/%(datadir)s/favicon.ico
 real url file://%(curdir)s/%(datadir)s/favicon.ico
 valid
 
+url http://imadoofus.org%0D%3Cfont%20face=%22Verdana,%20Arial,%20Helvetica,%20sans-serif%22%20size=%222%22%3E%3Chttp://www.imadoofus.org%3E%20%0D%20%20%20%20%20%20%20%20%20%20%20%20%20%20
+cache key None
+real url None
+name blubb
+error
+
 url 
 cache key None
 real url None
diff --git a/linkcheck/tests/test_url.py b/linkcheck/tests/test_url.py
index 42acf6db..15da2bb2 100644
--- a/linkcheck/tests/test_url.py
+++ b/linkcheck/tests/test_url.py
@@ -495,12 +495,15 @@ class TestUrl (unittest.TestCase):
         Test idna encoding.
         """
         url = u'www.öko.de'
-        encurl, is_idn = linkcheck.url.idna_encode(url)
+        idna_encode =linkcheck.url.idna_encode
+        encurl, is_idn = idna_encode(url)
         self.assert_(is_idn)
         url = u''
-        encurl, is_idn = linkcheck.url.idna_encode(url)
+        encurl, is_idn = idna_encode(url)
         self.assert_(not is_idn)
         self.assert_(not encurl)
+        url = u"http://www.imadoofus.org%0D%3Cfont%20face=%22Verdana,%20Arial,%20Helvetica,%20sans-serif%22%20size=%222%22%3E%3Chttp://www.imadoofus.org%3E%20%0D%20%20%20%20%20%20%20%20%20%20%20%20%20%20"
+        self.assertRaises(UnicodeError, idna_encode, url)
 
     def test_match_host (self):
         """