diff --git a/tools/jid.py b/tools/jid.py
index b3ba3644..238b884c 100644
--- a/tools/jid.py
+++ b/tools/jid.py
@@ -33,14 +33,14 @@ class JID(str):
         """find node domaine and resource"""
         node_end=self.find('@')
         if node_end<0:
-            node_end=len(self)
+            node_end=0
         domain_end=self.find('/')
         if domain_end<1:
             domain_end=len(self)
         self.node=self[:node_end]
-        self.domain=self[node_end+1:domain_end]
+        self.domain=self[(node_end+1) if node_end else 0:domain_end]
         self.resource=self[domain_end+1:]
-        if node_end==len(self):
+        if not node_end:
             self.short=self
         else:
             self.short=self.node+'@'+self.domain