diff --git a/ChangeLog b/ChangeLog
index e2bc31a5eb..8dc757be48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-02-05  Garry R. Osgood <gosgood@idt.net>
+
+        * gimp/plug-ins/sample_colorize.c
+
+        Sample Colorize was not colorizing. Author
+        misused gimp_selection_bounds(); assumed that
+        "selection is empty" indicator was this
+        function's return value [p_init_gdrw() line 2597]
+        Caused the plugin to assume an active selection
+        was in progress even when there wasn't. Usually,
+        this precluded any kind of colorization.
+        Sanity-checked the existence of widgets before
+        their passage to GTK.
+
 Sun Feb  7 00:14:26 CET 2000 Sven Neumann <sven@gimp.org>
 
 	* libgimp/gimpenv.[ch]: use g* types and moved the documentation
diff --git a/plug-ins/common/sample_colorize.c b/plug-ins/common/sample_colorize.c
index 84f25f8657..a9351f74f1 100644
--- a/plug-ins/common/sample_colorize.c
+++ b/plug-ins/common/sample_colorize.c
@@ -497,8 +497,10 @@ p_gradient_callback(GtkWidget *w, gint32 id)
       p_get_gradient(id); 
       p_smp_get_colors_callback(NULL, NULL);
       if(g_di.sample_preview) p_clear_preview(g_di.sample_preview);
-      gtk_widget_set_sensitive(g_di.apply_button,TRUE);	      
-      gtk_widget_set_sensitive(g_di.get_smp_colors_button,FALSE);	      
+      if(g_di.apply_button != NULL)
+        gtk_widget_set_sensitive(g_di.apply_button,TRUE);
+      if(g_di.get_smp_colors_button != NULL)	      
+        gtk_widget_set_sensitive(g_di.get_smp_colors_button,FALSE);	      
    }
 } /* end p_gradient_callback */
 
@@ -513,7 +515,8 @@ p_smp_menu_callback(gint32 id, gpointer data)
    {
       *id_ptr = id;
       p_update_preview(id_ptr);
-      gtk_widget_set_sensitive(g_di.get_smp_colors_button,TRUE);	      
+      if(g_di.get_smp_colors_button != NULL)
+        gtk_widget_set_sensitive(g_di.get_smp_colors_button,TRUE);	      
    }
 } /* end p_smp_menu_callback */
 
@@ -913,7 +916,8 @@ p_smp_get_colors_callback (GdkWindow *window,
   {
      if (p_main_colorize(MC_GET_SAMPLE_COLORS) >= 0)  /* do not colorize, just analyze sample colors */
      {
-       gtk_widget_set_sensitive(g_di.apply_button,TRUE);	      
+       if(g_di.apply_button != NULL)
+         gtk_widget_set_sensitive(g_di.apply_button,TRUE);	      
      }
   }
   for (i = 0; i < GRADIENT_HEIGHT; i++)
@@ -2594,8 +2598,8 @@ p_init_gdrw(t_GDRW *gdrw, GDrawable *drawable, int dirty, int shadow)
      printf("p_init_gdrw: OFFS       x: %d y: %d\n", (int)l_offsetx, (int)l_offsety );
   }
 
-  if (gimp_selection_bounds (l_image_id, &non_empty, &l_x1, &l_y1, &l_x2, &l_y2)
-      && (l_sel_channel_id >= 0))
+  gimp_selection_bounds (l_image_id, &non_empty, &l_x1, &l_y1, &l_x2, &l_y2);
+  if (non_empty && (l_sel_channel_id >= 0))
   {
       /* selection is TRUE */
       l_sel_gdrw = (t_GDRW *) calloc(1, sizeof(t_GDRW));