diff --git a/ChangeLog b/ChangeLog
index 05a889b2b5..ba20f658f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-26  Edward Hervey  <edward@fluendo.com>
+
+	* gst/gstpluginfeature.c: (gst_plugin_feature_load):
+	This shouldn't issue a g_warning since it returns NULL if it
+	couldn't find the plugin, and all functions using this behave
+	properly on a NULL return. Switching to a GST_WARNING.
+
 2005-11-25  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/gstbin.c: (gst_bin_handle_message_func):
diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 86071a3634..b2c0bdcfb0 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -110,7 +110,7 @@ gst_plugin_feature_load (GstPluginFeature * feature)
   GST_DEBUG ("loading plugin %s", feature->plugin_name);
   plugin = gst_plugin_load_by_name (feature->plugin_name);
   if (!plugin) {
-    g_critical ("Failed to load plugin containing feature '%s'.",
+    GST_WARNING ("Failed to load plugin containing feature '%s'.",
         GST_PLUGIN_FEATURE_NAME (feature));
     return NULL;
   }