diff --git a/ChangeLog b/ChangeLog
index fd3b1c544..72ba23311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-02  Elliot Lee  <sopwith@redhat.com>
+	* capplets/*/*.c, control-center/{callbacks.c,capplet-widget.c}:
+	  If help isn't found, display an error message.
+	
 1999-09-01  Elliot Lee  <sopwith@redhat.com>
 	* capplets/gnome-edit-properties/gnome-edit-properties.c:
 	When reverting, store the executable name, not the viewed name.
diff --git a/capplets/mime-type/mime-type-capplet.c b/capplets/mime-type/mime-type-capplet.c
index 294aaec51..359db7354 100644
--- a/capplets/mime-type/mime-type-capplet.c
+++ b/capplets/mime-type/mime-type-capplet.c
@@ -61,11 +61,13 @@ cancel_callback ()
         write_initial_keys ();
         write_initial_mime ();
 }
+
 static void
 help_callback ()
 {
         /* Sigh... empty as always */
 }
+
 static void
 init_mime_capplet ()
 {
@@ -106,8 +108,10 @@ init_mime_capplet ()
                            GTK_SIGNAL_FUNC(hide_edit_window), NULL);
         gtk_signal_connect(GTK_OBJECT(capplet), "page_shown",
                            GTK_SIGNAL_FUNC(show_edit_window), NULL);
+#if 0
         gtk_signal_connect(GTK_OBJECT(capplet), "help",
                            GTK_SIGNAL_FUNC(help_callback), NULL);
+#endif
 }
 
 int
diff --git a/capplets/theme-switcher/gui.c b/capplets/theme-switcher/gui.c
index adb9443d3..f7e884aa2 100644
--- a/capplets/theme-switcher/gui.c
+++ b/capplets/theme-switcher/gui.c
@@ -355,6 +355,14 @@ click_help(GtkWidget *widget, gpointer data)
   if (tmp) {
     gnome_help_goto(0, tmp);
     g_free(tmp);
+  } else {
+    GtkWidget *mbox;
+
+    mbox = gnome_message_box_new(_("No help is available/installed for these settings. Please make sure you\nhave the GNOME User's Guide installed on your system."),
+				 GNOME_MESSAGE_BOX_ERROR,
+				 _("Close"), NULL);
+    
+    gtk_widget_show(mbox);
   }
 
 }
diff --git a/capplets/theme-switcher/gui.c-6060 b/capplets/theme-switcher/gui.c-6060
index adb9443d3..f7e884aa2 100644
--- a/capplets/theme-switcher/gui.c-6060
+++ b/capplets/theme-switcher/gui.c-6060
@@ -355,6 +355,14 @@ click_help(GtkWidget *widget, gpointer data)
   if (tmp) {
     gnome_help_goto(0, tmp);
     g_free(tmp);
+  } else {
+    GtkWidget *mbox;
+
+    mbox = gnome_message_box_new(_("No help is available/installed for these settings. Please make sure you\nhave the GNOME User's Guide installed on your system."),
+				 GNOME_MESSAGE_BOX_ERROR,
+				 _("Close"), NULL);
+    
+    gtk_widget_show(mbox);
   }
 
 }
diff --git a/capplets/wm-properties/wm-properties-capplet.c b/capplets/wm-properties/wm-properties-capplet.c
index 9587854f3..48f06f09a 100644
--- a/capplets/wm-properties/wm-properties-capplet.c
+++ b/capplets/wm-properties/wm-properties-capplet.c
@@ -599,6 +599,14 @@ help_callback (void)
   if (tmp) {
     gnome_help_goto(0, tmp);
     g_free(tmp);
+  } else {
+    GtkWidget *mbox;
+
+    mbox = gnome_message_box_new(_("No help is available/installed for these settings. Please make sure you\nhave the GNOME User's Guide installed on your system."),
+				 GNOME_MESSAGE_BOX_ERROR,
+				 _("Close"), NULL);
+
+    gtk_widget_show(mbox);
   }
 }