diff --git a/ChangeLog b/ChangeLog
index eb4dd67f9..e07b6e08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-09  Mike Kestner  <mkestner@novell.com>
+
+	* glib/Opaque.cs (GetOpaque): return null for IntPtr.Zero.
+
 2009-01-09  Mike Kestner  <mkestner@novell.com>
 
 	* configure.in.in: don't hardcode CC when cross-compiling.
diff --git a/glib/Opaque.cs b/glib/Opaque.cs
index 4258d56b6..b4e463dc2 100644
--- a/glib/Opaque.cs
+++ b/glib/Opaque.cs
@@ -44,6 +44,9 @@ namespace GLib {
 
 		public static Opaque GetOpaque (IntPtr o, Type type, bool owned)
 		{
+			if (o == IntPtr.Zero)
+				return null;
+
 			Opaque opaque = (Opaque)Activator.CreateInstance (type, new object[] { o });
 			if (owned) {
 				if (opaque.owned) {