diff --git a/ChangeLog b/ChangeLog
index 54b3cf3ac6..425659d630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkbuilderparser.c (parse_property): Handle misplaced
+	property elements without asserting.
+
 2007-11-09  Kristian Rietveld  <kris@imendio.com>
 
 	* gdk/gdkwindow.c (gdk_window_process_all_updates): guard for
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index a394e1e8f4..b06df7951a 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -379,7 +379,11 @@ parse_property (ParserData   *data,
   gboolean translatable = FALSE;
   int i;
 
-  g_assert (data->stack != NULL);
+  if (data->stack == NULL) 
+    {
+      error_invalid_tag (data, "property", NULL, error);
+      return;
+    }
 
   for (i = 0; names[i] != NULL; i++)
     {