diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index e3d89a81..45d1821c 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -1846,7 +1846,7 @@ mysql_close(MYSQL *mysql)
 {
   if (mysql)					/* Some simple safety */
   {
-    if (mysql->extension->conn_hdlr)
+    if ((mysql->extension && mysql->extension->conn_hdlr)
     {
       MA_CONNECTION_HANDLER *p= mysql->extension->conn_hdlr;
       p->plugin->close(mysql);