diff --git a/src/monocoque/monocoque.c b/src/monocoque/monocoque.c
index 759be7e..c80e878 100644
--- a/src/monocoque/monocoque.c
+++ b/src/monocoque/monocoque.c
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
     if(!xdgInitHandle(&xdg))
     {
         fprintf(stderr, "Function xdgInitHandle() failed, is $HOME unset?\n");
-        goto cleanup;
+        goto cleanup_final;
     }
 
     const char* config_home_str = xdgConfigHome(&xdg);
@@ -152,6 +152,7 @@ int main(int argc, char** argv)
     {
         slog_disable(SLOG_DEBUG);
     }
+    xdgWipeHandle(&xdg);
 
     slogi("checking for diameters config");
     char* diameters_file_str;
@@ -172,7 +173,7 @@ int main(int argc, char** argv)
     {
         fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), config_error_line(&cfg), config_error_text(&cfg));
         config_destroy(&cfg);
-        goto cleanup;
+        goto cleanup_final;
     }
     else
     {
@@ -314,8 +315,6 @@ int main(int argc, char** argv)
 
 
 
-cleanup:
-    xdgWipeHandle(&xdg);
 cleanup_final:
     monocoquesettingsfree(ms);
     free(ms);