diff --git a/ChangeLog b/ChangeLog
index 34a6fedd..6ff34b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 10 16:20:34 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* python/generator.py: fixed a bug raised by Raymond Wiker, 
+	  docSetRootElement() should not raise an exception if the
+	  return is None
+
 Fri Jan 10 14:13:03 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* python/libxml.py python/libxml.c python/libxml2-python-api.xml:
diff --git a/python/generator.py b/python/generator.py
index 2d1de5a6..9adbfbee 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -632,6 +632,7 @@ classes_destructors = {
 functions_noexcept = {
     "xmlHasProp": 1,
     "xmlHasNsProp": 1,
+    "xmlDocSetRootElement": 1,
 }
 
 reference_keepers = {