diff --git a/ChangeLog b/ChangeLog
index 2bc62dc4f..ad66b0e09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-06  Rachel Hestilow  <hestilow@ximian.com>
+
+	* generator/Parameters.cs (Initialize): Initialize error
+	to zero.
+
 2002-07-06  Rachel Hestilow  <hestilow@ximian.com>
 
 	* ObjectGen.cs: Support static string elements. Do
diff --git a/generator/Parameters.cs b/generator/Parameters.cs
index 5b73f6ffb..b37aa7830 100644
--- a/generator/Parameters.cs
+++ b/generator/Parameters.cs
@@ -183,7 +183,7 @@ namespace GtkSharp.Generation {
 			}
 
 			if (ThrowsException)
-				sw.WriteLine (indent + "\t\t\tIntPtr error;");
+				sw.WriteLine (indent + "\t\t\tIntPtr error = IntPtr.Zero;");
 		}
 /*
 		public void Finish (StreamWriter sw)
diff --git a/glue/program.c b/glue/program.c
index 855a8e890..33ef274bc 100644
--- a/glue/program.c
+++ b/glue/program.c
@@ -129,7 +129,7 @@ gtksharp_gnome_program_init (const char *app_id, const char *app_version,
 		g_free (gnome_espeaker);
 	
 	g_free (unhandled);
-
+	
 	/* Remove this too when marshalling fixed */
 	g_free (argv);