1 files changed, 5 insertions, 2 deletions

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index ba0e246d2..eb0373039 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -1459,8 +1459,11 @@ cleaning_task (void *cls,
   }
   if (GNUNET_YES == do_drop)
     plugin->api->drop (plugin->api->cls);
-  unload_plugin (plugin);
-  plugin = NULL;
+  if (NULL != plugin)
+  {
+    unload_plugin (plugin);
+    plugin = NULL;
+  }
   if (NULL != filter)
   {
     GNUNET_CONTAINER_bloomfilter_free (filter);