diff --git a/ChangeLog b/ChangeLog
index e19787986..469fae59d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2004-05-10  Mike Kestner  <mkestner@ximian.com>
+2004-05-11  Mike Kestner  <mkestner@ximian.com>
+
+	* gconf/GConf/NotifyWrapper.cs : add some defensive null checking.
+	[fixes #57902]
+
+2004-05-11  Mike Kestner  <mkestner@ximian.com>
 
 	* gtk/SelectionData.custom : add a Set overload without length param.
 
diff --git a/gconf/GConf/NotifyWrapper.cs b/gconf/GConf/NotifyWrapper.cs
index 46531435e..a625ce701 100644
--- a/gconf/GConf/NotifyWrapper.cs
+++ b/gconf/GConf/NotifyWrapper.cs
@@ -15,6 +15,10 @@ namespace GConf
 		{
 			Client client = new Client (client_ptr);
 			_Entry entry = new _Entry (entry_ptr);
+			if (entry.ValuePtr == IntPtr.Zero) {
+				notify (client, new NotifyEventArgs (entry.Key, null));
+				return;
+			}
 			Value val = new Value (entry.ValuePtr);
 			val.Managed = false;
 			notify (client, new NotifyEventArgs (entry.Key, val.Get ()));