diff --git a/ChangeLog b/ChangeLog
index d68ca562c..569691bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-05  Mike Kestner  <mkestner@novell.com>
+
+	* glib/ToggleRef.cs : flush a few leftover changes from a
+	ToggleRef refinement.
+
 2007-03-15  Mike Kestner  <mkestner@novell.com>
 
 	* generator/CallbackGen.cs : generate try/catch blocks for
diff --git a/glib/ToggleRef.cs b/glib/ToggleRef.cs
index 95db121cf..1d4164d79 100644
--- a/glib/ToggleRef.cs
+++ b/glib/ToggleRef.cs
@@ -62,6 +62,7 @@ namespace GLib {
 		public void Free ()
 		{
 			g_object_remove_toggle_ref (handle, ToggleNotifyCallback, (IntPtr) gch);
+			reference = null;
 			gch.Free ();
 		}
 
@@ -73,8 +74,6 @@ namespace GLib {
 				WeakReference weak = reference as WeakReference;
 				if (weak.IsAlive)
 					reference = weak.Target;
-				else
-					throw new Exception ("Toggling dead wrapper");
 			}
 		}