diff --git a/ChangeLog b/ChangeLog
index 2fa8cf4bc1..a979052e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150406, reported by Fernando San Martín Woerner, patch
+	by Gustavo Carneiro.
+	
+	* gtk/gtkentrycompletion.c 
+	(gtk_entry_completion_default_completion_func): Check that 
+	column is of type G_TYPE_STRING before proceeding.
+
 Sat Aug 21 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2fa8cf4bc1..a979052e59 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150406, reported by Fernando San Martín Woerner, patch
+	by Gustavo Carneiro.
+	
+	* gtk/gtkentrycompletion.c 
+	(gtk_entry_completion_default_completion_func): Check that 
+	column is of type G_TYPE_STRING before proceeding.
+
 Sat Aug 21 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2fa8cf4bc1..a979052e59 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150406, reported by Fernando San Martín Woerner, patch
+	by Gustavo Carneiro.
+	
+	* gtk/gtkentrycompletion.c 
+	(gtk_entry_completion_default_completion_func): Check that 
+	column is of type G_TYPE_STRING before proceeding.
+
 Sat Aug 21 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2fa8cf4bc1..a979052e59 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150406, reported by Fernando San Martín Woerner, patch
+	by Gustavo Carneiro.
+	
+	* gtk/gtkentrycompletion.c 
+	(gtk_entry_completion_default_completion_func): Check that 
+	column is of type G_TYPE_STRING before proceeding.
+
 Sat Aug 21 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an 
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 511f4b6fb4..f2abe951c2 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -675,6 +675,9 @@ gtk_entry_completion_default_completion_func (GtkEntryCompletion *completion,
 
   model = gtk_tree_model_filter_get_model (completion->priv->filter_model);
 
+  g_return_val_if_fail (gtk_tree_model_get_column_type (model, completion->priv->text_column) == G_TYPE_STRING, 
+			FALSE);
+
   gtk_tree_model_get (model, iter,
                       completion->priv->text_column, &item,
                       -1);