diff --git a/src/libvirt.c b/src/libvirt.c
index 19379a2a53..2d32f8f2e8 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -882,9 +882,9 @@ virConnectOpenInternal(const char *name,
 {
     size_t i;
     int res;
-    virConnectPtr ret;
+    g_autoptr(virConnect) ret = NULL;
     g_autoptr(virConf) conf = NULL;
-    char *uristr = NULL;
+    g_autofree char *uristr = NULL;
     bool embed = false;
 
     ret = virGetConnect();
@@ -1151,14 +1151,9 @@ virConnectOpenInternal(const char *name,
         goto failed;
     }
 
-    VIR_FREE(uristr);
-
-    return ret;
+    return g_steal_pointer(&ret);
 
  failed:
-    VIR_FREE(uristr);
-    virObjectUnref(ret);
-
     return NULL;
 }