diff --git a/ChangeLog b/ChangeLog
index d240cf87b..3bf009dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-17  Mike Kestner  <mkestner@novell.com>
+
+	* generator/Property.cs: missing Parent null check needed for direct
+	GLib.Object subclasses.  Suggested by mario@gnome.cl.  [Fixes #321536]
+	
 2008-01-17  Mike Kestner  <mkestner@novell.com>
 
 	* sample/Assistant.cs: new Gtk.Assistant sample.
diff --git a/generator/Property.cs b/generator/Property.cs
index f7d540b47..8a16d1667 100644
--- a/generator/Property.cs
+++ b/generator/Property.cs
@@ -105,7 +105,7 @@ namespace GtkSharp.Generation {
 
 			if (IsNew || (container_type.Parent != null && container_type.Parent.GetPropertyRecursively (Name) != null))
 				modifiers = "new ";
-			else if (implementor != null && implementor.Parent.GetPropertyRecursively (Name) != null)
+			else if (implementor != null && implementor.Parent != null && implementor.Parent.GetPropertyRecursively (Name) != null)
 				modifiers = "new ";
 
 			string name = Name;