commit 3b2619eeeb096cc9b581eb2ff86326d601fe6fac
Author: Thomas Mittelstaedt <tmstaedt@t-mittelstaedt.de>
Date:   Wed Aug 25 05:35:15 2010 +0200

    Return early, if layout is NULL

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 60624a5..7aec3de 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -218,6 +218,7 @@ static void update_im_cursor_location (ECellTextView *tv);
 gchar *
 e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 {
+	g_return_val_if_fail(ECT_CLASS(cell) != NULL, NULL);
 	if (ECT_CLASS(cell)->get_text)
 		return ECT_CLASS(cell)->get_text (cell, model, col, row);
 	else
@@ -572,7 +573,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 	pango_layout_set_attributes (layout, attrs);
 	pango_attr_list_unref (attrs);
 
-	if (text_view->edit || width <= 0)
+	if (text_view->edit || width <= 0 || layout == NULL)
 		return layout;
 
 	context = pango_layout_get_context (layout);
