diff --git a/ChangeLog b/ChangeLog
index 57eb680fb0..4c1de2e401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimplayertreeview.c
+	(gimp_layer_tree_view_set_context): don't do stuff on NULL mask
+	view renderers. Fixes bug #389307.
+
 2006-12-24  Mukund Sivaraman  <muks@mukund.org>
 
 	* app/core/Makefile.am
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index 7b370d8b75..2730ec3dcd 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -551,8 +551,11 @@ gimp_layer_tree_view_set_context (GimpContainerView *view,
                               layer_view->model_column_mask, &renderer,
                               -1);
 
-          gimp_view_renderer_set_context (renderer, context);
-          g_object_unref (renderer);
+          if (renderer)
+            {
+              gimp_view_renderer_set_context (renderer, context);
+              g_object_unref (renderer);
+            }
         }
     }
 }