diff --git a/ChangeLog.gtk-extended-layout b/ChangeLog.gtk-extended-layout
index 964a0349ba..8ae977f0f0 100644
--- a/ChangeLog.gtk-extended-layout
+++ b/ChangeLog.gtk-extended-layout
@@ -1,3 +1,8 @@
+2007-06-28  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
+
+	* gtk/gtkbin.c: Prevent undefined behaviour when
+	gtk_widget_translate_coordinates fails.
+	
 2007-06-20  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
 
 	* tests/testextendedlayout.c: Provide checkboxes 
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index d4b6e77b15..4ccc83fedb 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -215,11 +215,10 @@ gtk_bin_extended_layout_get_baselines (GtkExtendedLayout  *layout,
   layout = GTK_EXTENDED_LAYOUT (bin->child);
   num_lines = gtk_extended_layout_get_baselines (layout, baselines);
 
-  if (baselines)
-    {
+  if (baselines &&
       gtk_widget_translate_coordinates (bin->child, GTK_WIDGET (bin),
-                                        0, 0, NULL, &dy);
-
+                                        0, 0, NULL, &dy))
+    {
       baseptr = *baselines;
       baseend = baseptr + num_lines;