diff --git a/ChangeLog b/ChangeLog
index 705ce561ae..2ea261f258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-23  Björn Lindqvist  <bjourne@gmail.com>
+
+	* gdk-pixbuf/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Guard
+	against NULL pointer. (#467051, Gian Mario Tagliaretti)
+
 2008-03-23  Cody Russell  <bratsche@gnome.org>
 
 	* gdk/win32/gdkevents-win32.c (show_window_recurse):
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 9214ce4cd6..5a6f598503 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -1497,6 +1497,8 @@ gdk_pixbuf_new_from_xpm_data (const char **data)
 	GdkPixbufModule *xpm_module;
 	gboolean locked;
 
+	g_return_val_if_fail (data != NULL, NULL);
+
 	xpm_module = _gdk_pixbuf_get_named_module ("xpm", &error);
 	if (xpm_module == NULL) {
 		g_warning ("Error loading XPM image loader: %s", error->message);