diff --git a/ChangeLog b/ChangeLog
index 9668b8ad5..339e9041f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-19  Mike Kestner  <mkestner@novell.com>
+
+	* generator/ManualGen.cs (CallByName): add null handling.
+	[Fixes #76540]
+
 2005-11-15  Ben Maurer  <bmaurer@ximian.com>
 
 	* gdk/Rectangle.custom: Fix up Intersect using p/invoke, per
diff --git a/doc/en/Gdk/Pixbuf.xml b/doc/en/Gdk/Pixbuf.xml
index 75e84ec55..d9317396e 100644
--- a/doc/en/Gdk/Pixbuf.xml
+++ b/doc/en/Gdk/Pixbuf.xml
@@ -1900,4 +1900,4 @@ Gdk.Pixbuf pb = new Gdk.Pixbuf(buffer, 10, 10);
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/CellRenderer.xml b/doc/en/Gtk/CellRenderer.xml
index 1bbc93eca..695e6149d 100644
--- a/doc/en/Gtk/CellRenderer.xml
+++ b/doc/en/Gtk/CellRenderer.xml
@@ -668,4 +668,4 @@ public class CellRendererCompletion : CellRendererText
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/TextView.xml b/doc/en/Gtk/TextView.xml
index c9c4fbf8d..ee399751d 100644
--- a/doc/en/Gtk/TextView.xml
+++ b/doc/en/Gtk/TextView.xml
@@ -1515,4 +1515,4 @@ class TextViewSample
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/generator/ManualGen.cs b/generator/ManualGen.cs
index 3f9556f67..ff2868550 100644
--- a/generator/ManualGen.cs
+++ b/generator/ManualGen.cs
@@ -46,7 +46,7 @@ namespace GtkSharp.Generation {
 
 		public override string CallByName (string var_name)
 		{
-			return var_name + ".Handle";
+			return var_name + " == null ? IntPtr.Zero : " + var_name + ".Handle";
 		}
 		
 		public override string FromNative(string var)