diff --git a/ChangeLog b/ChangeLog
index 1425fc38b50f64a367ba4722e24bcbd07c48c7a4..f959dca9f8b74d75518ca542ae7bbfa5fdc3b773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 22 12:14:48 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/storage_driver.c: cleanup when creating a storage pool fails,
+	  patch by Henrik Persson
+
 Fri Jun 19 14:32:41 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
 	* qemud/qemud.c src/conf.c src/conf.h src/qemu_conf.c src/xen_unified.c
diff --git a/src/storage_driver.c b/src/storage_driver.c
index 71e64a445d40a3f6b423703f41f268e6a50a38a6..4a6e5e24e5cedbb40b6e7ad5a807b0cfb5c66b85 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -498,11 +498,13 @@ storagePoolCreate(virConnectPtr conn,
     pool->active = 1;
 
     ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid);
+    virStoragePoolObjUnlock(pool);
+    pool = NULL;
 
 cleanup:
     virStoragePoolDefFree(def);
     if (pool)
-        virStoragePoolObjUnlock(pool);
+        virStoragePoolObjRemove(&driver->pools, pool);
     storageDriverUnlock(driver);
     return ret;
 }