1 files changed, 5 insertions, 4 deletions
diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py
index 9c91578a8..3602d22cd 100644
--- a/ipapython/dnsutil.py
+++ b/ipapython/dnsutil.py
@@ -18,6 +18,7 @@
 #
 
 import dns.name
+import dns.exception
 import copy
 
 
@@ -35,10 +36,10 @@ class DNSName(dns.name.Name):
             labels = labels.labels
         try:
             super(DNSName, self).__init__(labels)
-        except UnicodeError:
-            #dnspython bug, punycoded label longer than 63 returns UnicodeError
-            #instead of LabelTooLong
-            raise dns.name.LabelTooLong()
+        except UnicodeError, e:
+            # dnspython bug, an invalid domain name returns the UnicodeError
+            # instead of a dns.exception
+            raise dns.exception.SyntaxError(e)
 
     def __nonzero__(self):
         #dns.name.from_text('@') is represented like empty tuple