diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c
index 242c3fa3a9..fb2821dc4b 100644
--- a/app/core/gimpparasitelist.c
+++ b/app/core/gimpparasitelist.c
@@ -331,9 +331,10 @@ gimp_parasite_list_remove (GimpParasiteList *list,
 
   if (list->table)
     {
-      GimpParasite *parasite;
+      GimpParasite *parasite = NULL;
 
-      parasite = (GimpParasite *) gimp_parasite_list_find (list, name);
+      if (name != NULL)
+        parasite = (GimpParasite *) gimp_parasite_list_find (list, name);
 
       if (parasite)
         {