diff --git a/ChangeLog b/ChangeLog
index f4ac923761..afe3066812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Tristan Van Berkom <tvb@gnome.org>
+
+	* gtk/gtkradiobutton.c: Fixed a warning from
+	g_object_set (radiobutton, "group", NULL, NULL).
+
 2007-02-26  Matthias Clasen <mclasen@redhat.com>
 
 	Apply a patch by Carlos Garnacho to fix several problems
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 0a08dbbfa4..7e3c349a67 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -144,10 +144,13 @@ gtk_radio_button_set_property (GObject      *object,
   switch (prop_id)
     {
       GSList *slist;
+      GtkRadioButton *button;
 
     case PROP_GROUP:
-      if (G_VALUE_HOLDS_OBJECT (value))
-	slist = gtk_radio_button_get_group ((GtkRadioButton*) g_value_get_object (value));
+        button = g_value_get_object (value);
+
+      if (button)
+	slist = gtk_radio_button_get_group (button);
       else
 	slist = NULL;
       gtk_radio_button_set_group (radio_button, slist);