diff --git a/ChangeLog b/ChangeLog
index a183dbacf..a3b2b27ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-11  Mike Kestner  <mkestner@novell.com>
+  
+ 	* gtk/Object.custom (Destroy): add a null check to avoid 
+	Gtk criticals.  The destroy case seems to be problematic with
+	a bunch of existing code, so this turns it into a noop.
+
 2007-09-06  Mike Kestner  <mkestner@novell.com>
   
  	* AssemblyInfo.cs.in : add IgnoreClassInitializers attr to all.
diff --git a/gtk/Object.custom b/gtk/Object.custom
index 58d96c767..a30ba2650 100755
--- a/gtk/Object.custom
+++ b/gtk/Object.custom
@@ -123,7 +123,8 @@
 
 		public virtual void Destroy ()
 		{
-			gtk_object_destroy (Handle);
+			if (Handle != IntPtr.Zero)
+				gtk_object_destroy (Handle);
 		}
 
 		[DllImport("gtksharpglue-2")]