diff --git a/src/ag-chart.c b/src/ag-chart.c
index 81cf304..1ff2a41 100644
--- a/src/ag-chart.c
+++ b/src/ag-chart.c
@@ -855,6 +855,7 @@ ag_chart_load_from_file(GFile *file, GError **err)
     house_system_enum_name = g_utf8_strdown(house_system_name, -1);
     g_free(house_system_name);
     house_system_class = g_type_class_ref(GSWE_TYPE_HOUSE_SYSTEM);
+
     if ((enum_value = g_enum_get_value_by_nick(
                  G_ENUM_CLASS(house_system_class),
                  house_system_enum_name
diff --git a/src/ag-window.c b/src/ag-window.c
index 16c9613..970e680 100644
--- a/src/ag-window.c
+++ b/src/ag-window.c
@@ -1483,7 +1483,7 @@ ag_window_set_chart(AgWindow *window, AgChart *chart)
                 chart_changed,
                 window
             );
-        g_object_unref(priv->chart);
+        g_clear_object(&(priv->chart));
     }
 
     ag_db_save_data_free(priv->saved_data);