diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 7852015364..7e5f618870 100644
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -488,14 +488,14 @@ class XendDomain:
         @type domid: int or string
         @return: Found domain.
         @rtype: XendDomainInfo
-        @raise XendError: If domain is not found.
+        @raise XendInvalidDomain: If domain is not found.
         """
         self.domains_lock.acquire()
         try:
             self._refresh(refresh_shutdown = False)
             dom = self.domain_lookup_nr(domid)
             if not dom:
-                raise XendError("No domain named '%s'." % str(domid))
+                raise XendInvalidDomain("No domain named '%s'." % str(domid))
             return dom
         finally:
             self.domains_lock.release()
diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py
index 950b26316d..fdee1b75ca 100644
--- a/tools/python/xen/xend/server/SrvDomainDir.py
+++ b/tools/python/xen/xend/server/SrvDomainDir.py
@@ -42,8 +42,6 @@ class SrvDomainDir(SrvDir):
 
     def domain(self, x):
         dom = self.xd.domain_lookup(x)
-        if not dom:
-            raise XendError('No such domain ' + str(x))
         return SrvDomain(dom)
 
     def get(self, x):
diff --git a/tools/python/xen/xend/server/XMLRPCServer.py b/tools/python/xen/xend/server/XMLRPCServer.py
index 09a66549e9..7c3a2a1a9d 100644
--- a/tools/python/xen/xend/server/XMLRPCServer.py
+++ b/tools/python/xen/xend/server/XMLRPCServer.py
@@ -43,8 +43,6 @@ def fixup_sxpr(sexpr):
 
 def lookup(domid):
     info = XendDomain.instance().domain_lookup(domid)
-    if not info:
-        raise XendInvalidDomain(str(domid))
     return info
 
 def dispatch(domid, fn, args):