diff --git a/ChangeLog b/ChangeLog
index 32868a5614..1a4d85f35c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstplugin.c: (gst_plugin_load_file):
+          fix segfault for when original plugin was loaded statically
+
 2004-04-05  Benjamin Otte  <otte@gnome.org>
 
 	* testsuite/debug/category.c: (main):
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 04225a7602..aca97185e0 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -330,7 +330,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
       } else {
         free_plugin = FALSE;
         if (gst_plugin_is_loaded (plugin)) {
-          if (strcmp (plugin->filename, filename) != 0) {
+          if (plugin->filename && strcmp (plugin->filename, filename) != 0) {
             GST_WARNING
                 ("plugin %p from file \"%s\" with same name %s is already "
                 "loaded, aborting loading of \"%s\"", plugin, plugin->filename,