diff --git a/source/background.c b/source/background.c
index 087639c9..947c85bb 100644
--- a/source/background.c
+++ b/source/background.c
@@ -2021,7 +2021,7 @@ int background_solve(
   }
 
   /** - perform the integration */
-  class_call(generic_evolver(background_derivs,
+  class_call_except(generic_evolver(background_derivs,
                              loga_ini,
                              loga_final,
                              pvecback_integration,
@@ -2038,7 +2038,12 @@ int background_solve(
                              NULL, //'print_variables' in evolver_rk could be set, but, not required
                              pba->error_message),
              pba->error_message,
-             pba->error_message);
+             pba->error_message,
+             background_free_noinput(pba);
+             free(pvecback);
+             free(pvecback_integration);
+             free(used_in_output);
+             );
 
   /** - recover some quantities today */
   /* -> age in Gyears */
diff --git a/source/fourier.c b/source/fourier.c
index c9b6d3bb..c301a9cb 100644
--- a/source/fourier.c
+++ b/source/fourier.c
@@ -1533,6 +1533,7 @@ int fourier_init(
                                       pnw),
                        pfo->error_message,
                        pfo->error_message,
+                       fourier_free(pfo);
                        fourier_hmcode_workspace_free(pfo,pnw);
                        for (index_pk=0; index_pk<pfo->pk_size; index_pk++){
                          free(pk_nl[index_pk]);