diff --git a/libmariadb/ma_client_plugin.c.in b/libmariadb/ma_client_plugin.c.in
index 6e0433b3..f6175035 100644
--- a/libmariadb/ma_client_plugin.c.in
+++ b/libmariadb/ma_client_plugin.c.in
@@ -137,7 +137,11 @@ static struct st_mysql_client_plugin *find_plugin(const char *name, int type)
     return 0;
 
   if (!name)
-    return plugin_list[plugin_nr]->plugin;
+  {
+    if (plugin_list[plugin_nr])
+      return plugin_list[plugin_nr]->plugin;
+    return NULL;
+  }
 
   for (p= plugin_list[plugin_nr]; p; p= p->next)
   {