diff --git a/ChangeLog b/ChangeLog
index 9cb2c89e6..861ea4cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-27  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/SelectionData.custom : guard against null in get_Text.
+	[Fixes #52713]
+
 2004-01-27  Mike Kestner  <mkestner@ximian.com>
 
 	* glue/selectiondata.c : expose data field.
diff --git a/gtk/SelectionData.custom b/gtk/SelectionData.custom
index 905be8729..f0d4289a3 100644
--- a/gtk/SelectionData.custom
+++ b/gtk/SelectionData.custom
@@ -24,7 +24,10 @@
 
 		public string Text {
 			get {
-				return GLibSharp.Marshaller.PtrToStringGFree (gtk_selection_data_get_text (Handle));
+				IntPtr text = gtk_selection_data_get_text (Handle);
+				if (text == IntPtr.Zero)
+					return null;
+				return GLibSharp.Marshaller.PtrToStringGFree (text);
 			}
 			set {
 				gtk_selection_data_set_text (Handle, value, value.Length);