diff --git a/ChangeLog b/ChangeLog
index de75536759fb6d1efbe1bd3055e87ca255cf60b2..a84e2b4b3369094f1177fa3ae2ef95f2a5382063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 16 10:29:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	Avoid harmless warning message
+	* src/qemu_driver.c, src/uml_driver.c: Don't try to close a
+	NULL virConnectPtr object.
+
 Thu Mar 12 21:13:40 CET 2009 Daniel Veillard <veilard@redhat.com>
 
 	* src/storage_conf.c: fix storage pool mode parsing, and refactoring
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index e73bd3aaccb15b3227611da1f790edaf26a338c6..dad709869fbbc79e9c9cab619664e471b1710564 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -235,7 +235,8 @@ qemudAutostartConfigs(struct qemud_driver *driver) {
         virDomainObjUnlock(vm);
     }
 
-    virConnectClose(conn);
+    if (conn)
+        virConnectClose(conn);
 }
 
 
diff --git a/src/uml_driver.c b/src/uml_driver.c
index a1fbc776b6fe6f4b60acebceb45c7734dd5ec258..1dc7ccdfea08b737f357b83741e49a9d7eac0d5d 100644
--- a/src/uml_driver.c
+++ b/src/uml_driver.c
@@ -146,7 +146,8 @@ umlAutostartConfigs(struct uml_driver *driver) {
         }
     }
 
-    virConnectClose(conn);
+    if (conn)
+        virConnectClose(conn);
 }