diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
index ae6b491686..556bc3050a 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -79,19 +79,15 @@ daemonConfigFilePath(bool privileged, char **configfile)
     if (privileged) {
         *configfile = g_strdup(SYSCONFDIR "/libvirt/" DAEMON_NAME ".conf");
     } else {
-        char *configdir = NULL;
+        g_autofree char *configdir = NULL;
 
         if (!(configdir = virGetUserConfigDirectory()))
-            goto error;
+            return -1;
 
         *configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME);
-        VIR_FREE(configdir);
     }
 
     return 0;
-
- error:
-    return -1;
 }
 
 struct daemonConfig*