diff --git a/source/libublsettings-char.c b/source/libublsettings-char.c
index 1048179..a588e6f 100644
--- a/source/libublsettings-char.c
+++ b/source/libublsettings-char.c
@@ -481,7 +481,9 @@ config_str yon_char_parsed_new (int *size, ...){
 void yon_char_parsed_free(config_str source, int size){
     if (source&&size>0){
         for (int i=0;i<size;i++){
-            free(source[i]);
+            if (source[i]){
+                free(source[i]);
+            }
         }
         free(source);
     }
diff --git a/source/libublsettings-file.c b/source/libublsettings-file.c
index 4bdfada..35e8b5e 100644
--- a/source/libublsettings-file.c
+++ b/source/libublsettings-file.c
@@ -30,7 +30,7 @@ config_str yon_file_open(char *file_path, int *size){
         char str_loaded[4098];
         config_str final_string = NULL;
         while (fgets(str_loaded,4098,file)){
-            final_string = final_string ? yon_char_parsed_append(final_string,size,str_loaded) : yon_char_parsed_new(size,str_loaded,NULL);
+            yon_char_parsed_add_or_create_if_exists(final_string,size,str_loaded);
         }
         fclose(file);
         return final_string;
diff --git a/source/libublsettings.h b/source/libublsettings.h
index 88cafb2..1d38310 100644
--- a/source/libublsettings.h
+++ b/source/libublsettings.h
@@ -1513,7 +1513,8 @@ enum YON_LOCALE_PARAMETER{
     YON_LOCALE_TERRITORY,
     YON_LOCALE_LANG_AB,
     YON_LOCALE_TITLE,
-    YON_LOCALE_CODE
+    YON_LOCALE_CODE,
+    YON_LOCALE_CODESET
 };
 
 typedef struct yon_hash_element{