diff --git a/ChangeLog b/ChangeLog
index 7371c8d702..44a18b3fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 15 16:33:25 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/storage_driver.c: fix a segfault, patch by Miloslav TrmaC
+
 Mon Dec 15 10:59:19 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/domain_conf.c: Unlock domain object after fetching
diff --git a/src/storage_driver.c b/src/storage_driver.c
index 2432a9a38a..e92f12278f 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -1235,9 +1235,9 @@ storageVolumeCreateXML(virStoragePoolPtr obj,
     }
 
     pool->volumes.objs[pool->volumes.count++] = vol;
-    vol = NULL;
 
     ret = virGetStorageVol(obj->conn, pool->def->name, vol->name, vol->key);
+    vol = NULL;
 
 cleanup:
     virStorageVolDefFree(vol);