diff --git a/ChangeLog b/ChangeLog
index a1747ac8b..57c6f5627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-31  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * icons/Makefile.am:
+   Include geany.ico in the distribution tarball.
+ * Makefile.am:
+   Fix 'make distcheck' by removing data/latex.tags from EXTRA_DIST.
+ * scripts/create_py_tags.py:
+   Make the script a bit more robust with newer Python versions.
+
+
 2010-01-31  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * plugins/export.c:
diff --git a/scripts/create_py_tags.py b/scripts/create_py_tags.py
index 22f1c8650..94e94040c 100755
--- a/scripts/create_py_tags.py
+++ b/scripts/create_py_tags.py
@@ -141,14 +141,17 @@ class Parser:
 					name = obj.__name__
 				except AttributeError:
 					name = obj_name
-				if not name or name.startswith('_'):
+				if not name or not isinstance(name, basestring) or name.startswith('_'):
 					# skip non-public tags
 					continue;
 				if inspect.isfunction(obj):
 					self._add_tag(obj, TYPE_FUNCTION)
 				elif inspect.isclass(obj):
 					self._add_tag(obj, TYPE_CLASS, self._get_superclass(obj))
-					methods = inspect.getmembers(obj, inspect.ismethod)
+					try:
+						methods = inspect.getmembers(obj, inspect.ismethod)
+					except AttributeError:
+						methods = []
 					for m_name, m_obj in methods:
 						# skip non-public tags
 						if m_name.startswith('_') or not inspect.ismethod(m_obj):