diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 4050c80..b6c1cbc 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -1435,8 +1435,8 @@ void on_main_tree_selection_changed(GtkWidget *self, main_window *widgets){
                     gtk_list_store_append(widgets->RepoFileList,&itar);
                     gtk_list_store_set(widgets->RepoFileList,&itar,1,level[i],-1);
                 }
-                free(archs_string);
-                free(info);
+                    if (!yon_char_is_empty(archs_string)) free(archs_string);
+                    if (!yon_char_is_empty(info))free(info);
                 yon_char_parsed_free(archs,arch_size);
 
             }
@@ -1481,7 +1481,7 @@ void on_main_tree_selection_changed(GtkWidget *self, main_window *widgets){
                                 gtk_list_store_set(widgets->RepoPackagesList,&itar,0,package_signature_error_icon_name,1,line[1],-1);
                         }
                     }
-                free(info);
+                    if (!yon_char_is_empty(info))free(info);
                 }
             break;
         }