diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index c9cd4a5d..6f5ec07e 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -811,7 +811,10 @@ my_bool _mariadb_set_conf_option(MYSQL *mysql, const char *config_option, const
           option_val= &val_sizet;
           break;
         case MARIADB_OPTION_STR:
-          option_val= (void*)config_value;
+          if (config_value && !config_value[0])
+            option_val= NULL;
+          else
+            option_val= (void*)config_value;
           break;
         case MARIADB_OPTION_NONE:
           break;
@@ -907,7 +910,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
         if (!key)
           goto error;
         *pos++= 0;
-        if (pos < end)
+        if (pos <= end)
           val= pos;
         continue;
         break;