diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f59f9e13ba..71c823abd0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18978,7 +18978,6 @@ virDomainFSInfoFormat(qemuAgentFSInfoPtr *agentinfo,
 
  cleanup:
     for (i = 0; i < nagentinfo; i++) {
-        qemuAgentFSInfoFree(agentinfo[i]);
         /* if there was an error, free any memory we've allocated for the
          * return value */
         if (info_ret)
@@ -18997,7 +18996,7 @@ qemuDomainGetFSInfo(virDomainPtr dom,
     virDomainObjPtr vm;
     qemuAgentFSInfoPtr *agentinfo = NULL;
     int ret = -1;
-    int nfs;
+    int nfs = 0;
 
     virCheckFlags(0, ret);
 
@@ -19022,7 +19021,12 @@ qemuDomainGetFSInfo(virDomainPtr dom,
     qemuDomainObjEndJob(driver, vm);
 
  cleanup:
-    g_free(agentinfo);
+    if (agentinfo) {
+        size_t i;
+        for (i = 0; i < nfs; i++)
+            qemuAgentFSInfoFree(agentinfo[i]);
+        g_free(agentinfo);
+    }
     virDomainObjEndAPI(&vm);
     return ret;
 }