diff --git a/ChangeLog b/ChangeLog
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fb9512c72f..ebae7289fe 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Feb 21 12:06:11 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
+
+	* gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a
+	NULL text pointer.
+
 Sat Feb 21 14:49:17 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkobject.h:
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8ba5d8454c..8ea5e06c75 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -399,6 +399,7 @@ gtk_entry_set_text (GtkEntry *entry,
 
   g_return_if_fail (entry != NULL);
   g_return_if_fail (GTK_IS_ENTRY (entry));
+  g_return_if_fail (text != NULL);
 
   gtk_real_entry_delete_text (entry, 0, entry->text_length);