diff --git a/src/common/dataforms.py b/src/common/dataforms.py
index 6c6817d6a10f706655194f0c5ce6e79717b82ed8..6e9522e2e58eeb424e7de54119a65f8d05db5b71 100644
--- a/src/common/dataforms.py
+++ b/src/common/dataforms.py
@@ -13,7 +13,7 @@ class WrongFieldValue(Error): pass	# when we get xmpp.Node which contains bad fi
 class ExtendedNode(xmpp.Node, object):
 	@classmethod
 	def __new__(cls,  *a, **b):
-		if 'extend' not in b.keys():
+		if 'extend' not in b.keys() or not b[keys]:
 			return object.__new__(cls)
 
 		extend = b['extend']