diff --git a/ChangeLog b/ChangeLog
index 667a427f6..bd271431a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-03  Mike Kestner  <mkestner@ximian.com>
+
+	* glib/ManagedValue.cs : null check on Free.
+	* glib/Value.cs : some ManagedValue rework because we unset now.
+	
 2004-02-02  Mike Kestner  <mkestner@ximian.com>
 
 	* generator/CustomMarshalerGen.cs : beginnings of a new generatable.
diff --git a/glib/ManagedValue.cs b/glib/ManagedValue.cs
index a07d82856..93d95148f 100644
--- a/glib/ManagedValue.cs
+++ b/glib/ManagedValue.cs
@@ -66,6 +66,8 @@ namespace GLibSharp {
 		public static void Free (IntPtr ptr)
 		{
 			ValueHolder holder = (ValueHolder) pointers[ptr];
+			if (holder == null)
+				return;
 			holder.ref_count--;
 			if (holder.ref_count < 1)
 				pointers.Remove (ptr);
diff --git a/glib/Value.cs b/glib/Value.cs
index 21095e5fb..652d8f65e 100755
--- a/glib/Value.cs
+++ b/glib/Value.cs
@@ -66,22 +66,21 @@ namespace GLib {
 		}
 
 		public void Dispose () {
-			if (_val != IntPtr.Zero) {
+			if (_val != IntPtr.Zero && needs_dispose) {
 				IntPtr rawtype = gtksharp_value_get_value_type (_val);
 				if (rawtype == ManagedValue.GType.Val) {
 					ManagedValue.Free (g_value_get_boxed (_val)); 
 				}
 			
-				if (needs_dispose)
-					lock (idle_queue) {
-						idle_queue.Enqueue (_val);
-						lock (typeof (Value)){
-							if (!idle_queued){
-								Idle.Add (new IdleHandler (DoDispose));
-								idle_queued = true;
-							}
+				lock (idle_queue) {
+					idle_queue.Enqueue (_val);
+					lock (typeof (Value)){
+						if (!idle_queued) {
+							Idle.Add (new IdleHandler (DoDispose));
+							idle_queued = true;
 						}
 					}
+				}
 				_val = IntPtr.Zero; 
 			}
 
@@ -353,9 +352,6 @@ namespace GLib {
 				g_value_set_enum (_val, (int) wrap); 
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
-		static extern void g_value_set_boxed_take_ownership (IntPtr val, IntPtr data);
-
 		[DllImport("libgobject-2.0-0.dll")]
 		static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type);
 
@@ -382,7 +378,7 @@ namespace GLib {
 			}
 			
 			if (type == GType.None)
-				g_value_set_boxed_take_ownership (_val, ManagedValue.WrapObject (obj));
+				g_value_set_boxed (_val, ManagedValue.WrapObject (obj));
 			else if (type == GType.String)
 				g_value_set_string (_val, (string) obj);
 			else if (type == GType.Boolean)
@@ -685,7 +681,7 @@ namespace GLib {
 			set {
 				GType type = GLibSharp.TypeConverter.LookupType (value.GetType());
 				if (type == GType.None)
-					g_value_set_boxed_take_ownership (_val, ManagedValue.WrapObject (value));
+					g_value_set_boxed (_val, ManagedValue.WrapObject (value));
 				else if (type == GType.String)
 					g_value_set_string (_val, (string) value);
 				else if (type == GType.Boolean)