diff --git a/ChangeLog b/ChangeLog
index 3440369fb..1cd5bd1d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-17  Mike Kestner  <mkestner@novell.com>
+
+	* generator/CallbackGen.cs : make GError** signatures fatal to
+	avoid compilation problem in gmime-sharp.
+
 2007-07-12  Mike Kestner  <mkestner@novell.com>
 
 	* generator/StructBase.cs : use typeof to pass type to PtrToStruct
diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs
index 48dec9681..a6c05ef6e 100644
--- a/generator/CallbackGen.cs
+++ b/generator/CallbackGen.cs
@@ -168,7 +168,7 @@ namespace GtkSharp.Generation {
 				sw.WriteLine (invoke + ";");
 
 			sw.Write (cleanup_str);
-			bool fatal = (retval.MarshalType != "void" && retval.MarshalType != "bool") || has_out_params;
+			bool fatal = (retval.MarshalType != "void" && retval.MarshalType != "bool") || has_out_params || throws_error;
 			sw.WriteLine ("\t\t\t} catch (Exception e) {");
 			sw.WriteLine ("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, " + (fatal ? "true" : "false") + ");");
 			if (fatal) {