diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 3616e60f27..c473348297 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -84,9 +84,13 @@ gst_plugin_feature_init (GstPluginFeature *feature)
 gboolean
 gst_plugin_feature_ensure_loaded (GstPluginFeature *feature)
 {
-  GstPlugin *plugin = (GstPlugin *) (feature->manager);
+  GstPlugin *plugin;
+  
+  g_return_val_if_fail (feature != NULL, FALSE);
+  g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), FALSE);
+
+  plugin = (GstPlugin *) (feature->manager);
 
-  g_assert (feature);
   if (plugin && !gst_plugin_is_loaded (plugin)) {
     if (GST_IS_REGISTRY (plugin->manager)) {
       GST_DEBUG (GST_CAT_PLUGIN_LOADING,