diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 458072cbf..3cc1105e4 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gmodule.c (g_module_symbol): Make sure to
+	not return TRUE if symbol is NULL.  (#334440,
+	ITOH Yasufumi)
+
 2006-03-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* ===  Released 2.10.1 ===
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index fbf24cc86..4e2360c62 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -601,7 +601,7 @@ g_module_symbol (GModule	*module,
     }
   
   g_static_rec_mutex_unlock (&g_module_global_lock);
-  return !module_error;
+  return *symbol != NULL;
 }
 
 G_CONST_RETURN gchar*