diff --git a/libgnucash/app-utils/gnc-state.c b/libgnucash/app-utils/gnc-state.c
index f416c9d0f2..b21c6f7249 100644
--- a/libgnucash/app-utils/gnc-state.c
+++ b/libgnucash/app-utils/gnc-state.c
@@ -193,7 +193,8 @@ gnc_state_set_base (const QofSession *session)
     DEBUG("Clean up");
     g_free(sf_extension);
     g_free(original);
-    g_key_file_free (key_file);
+    if (key_file != NULL)
+        g_key_file_free (key_file);
 
     LEAVE ();
 }