diff -urNp origin-rh/src/gpm-info.c new/src/gpm-info.c
--- origin-rh/src/gpm-info.c	2007-06-01 11:33:47.000000000 +0100
+++ new/src/gpm-info.c	2007-06-01 11:38:21.000000000 +0100
@@ -147,6 +147,10 @@ gpm_info_specific_device_widgets (GpmInf
 	/* set icon name */
 	g_sprintf (widgetname, "image_%s%i", prefix, id);
 	widget = glade_xml_get_widget (info->priv->glade_xml, widgetname);
+	if (widget == NULL) {
+		gpm_warning ("glade_xml_get_widget(%s) returned NULL!", widgetname);
+		return;
+	}
 	device = gpm_power_get_battery_device_entry (info->priv->power, kind, id);
 	if (device == NULL) {
 		gpm_warning ("gpm_power_get_battery_device_entry returned NULL!");
@@ -160,6 +164,10 @@ gpm_info_specific_device_widgets (GpmInf
 	/* set info */
 	g_sprintf (widgetname, "label_%s%i", prefix, id);
 	widget = glade_xml_get_widget (info->priv->glade_xml, widgetname);
+	if (widget == NULL) {
+		gpm_warning ("glade_xml_get_widget(%s) returned NULL!", widgetname);
+		return;
+	}
 	desc = gpm_power_status_for_device (device);
 	gtk_label_set_markup (GTK_LABEL (widget), desc->str);
 	g_string_free (desc, TRUE);
@@ -168,11 +176,19 @@ gpm_info_specific_device_widgets (GpmInf
 	/* set more */
 	g_sprintf (widgetname, "expander_%s%i", prefix, id);
 	widget = glade_xml_get_widget (info->priv->glade_xml, widgetname);
+	if (widget == NULL) {
+		gpm_warning ("glade_xml_get_widget(%s) returned NULL!", widgetname);
+		return;
+	}
 	if (device->battery_status.is_present) {
-		/* only show expander is battery is present */
+		/* only show expander if battery is present */
 		gtk_widget_show (GTK_WIDGET (widget));
 		g_sprintf (widgetname, "label_%s%i_more", prefix, id);
 		widget = glade_xml_get_widget (info->priv->glade_xml, widgetname);
+		if (widget == NULL) {
+			gpm_warning ("glade_xml_get_widget(%s) returned NULL!", widgetname);
+			return;
+		}
 		desc = gpm_power_status_for_device_more (device);
 		gtk_label_set_markup (GTK_LABEL (widget), desc->str);
 		g_string_free (desc, TRUE);