diff --git a/ChangeLog b/ChangeLog
index 82bb4f45f3..3f5fe1e4b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 22 11:33:16 EST 2008 Cole Robinson <crobinso@redhat.com>
+
+	* src/storage_driver.c: Fix storage driver null dereference.
+
 Mon Dec 22 11:27:52 EST 2008 Cole Robinson <crobinso@redhat.com>
 
 	* src/virsh.c: Merge xml building for virsh pool-*-as
diff --git a/src/storage_driver.c b/src/storage_driver.c
index e92f12278f..7f48719406 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -544,12 +544,13 @@ storagePoolDefine(virConnectPtr conn,
 
     if (!(pool = virStoragePoolObjAssignDef(conn, &driver->pools, def)))
         goto cleanup;
-    def = NULL;
 
     if (virStoragePoolObjSaveDef(conn, driver, pool, def) < 0) {
         virStoragePoolObjRemove(&driver->pools, pool);
+        def = NULL;
         goto cleanup;
     }
+    def = NULL;
 
     ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid);