diff --git a/ChangeLog b/ChangeLog
index d3b85dac8c..eefc6664ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 21 19:13:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
+	* src/qemu_driver.c src/storage_conf.c src/network_driver.c
+	  src/storage_driver.c: Shore up the uses of virGetLastError() so that
+	  if a path forgets to set a virError, we don't crash while trying
+	  to dereference the NULL pointer to print out.
+
 Tue Oct 21 09:19:24 PDT 2008 Dan Smith <danms@us.ibm.com>
 	* src/cgroup.c src/cgroup.h: Add function to allow major device range
 	* src/lxc_container.h src/controller.c: Fix cgroup initialization
diff --git a/src/network_driver.c b/src/network_driver.c
index 411cfde298..f483a258ab 100644
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -98,7 +98,8 @@ networkAutostartConfigs(struct network_driver *driver) {
             networkStartNetworkDaemon(NULL, driver, driver->networks.objs[i]) < 0) {
             virErrorPtr err = virGetLastError();
             networkLog(NETWORK_ERR, _("Failed to autostart network '%s': %s\n"),
-                       driver->networks.objs[i]->def->name, err->message);
+                       driver->networks.objs[i]->def->name,
+                       err ? err->message : NULL);
         }
     }
 }
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 59d7166a61..34f743b684 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -136,7 +136,8 @@ qemudAutostartConfigs(struct qemud_driver *driver) {
             qemudStartVMDaemon(NULL, driver, driver->domains.objs[i], NULL) < 0) {
             virErrorPtr err = virGetLastError();
             qemudLog(QEMUD_ERR, _("Failed to autostart VM '%s': %s\n"),
-                     driver->domains.objs[i]->def->name, err->message);
+                     driver->domains.objs[i]->def->name,
+                     err ? err->message : NULL);
         }
     }
 }
diff --git a/src/storage_conf.c b/src/storage_conf.c
index db56b3c79a..23e7538f0c 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -1043,7 +1043,7 @@ virStoragePoolObjLoad(virConnectPtr conn,
     if (!(def = virStoragePoolDefParse(NULL, xml, file))) {
         virErrorPtr err = virGetLastError();
         virStorageLog("Error parsing storage pool config '%s' : %s",
-                      path, err->message);
+                      path, err ? err->message : NULL);
         return NULL;
     }
 
diff --git a/src/storage_driver.c b/src/storage_driver.c
index e0d97e1fb1..0773821070 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -232,7 +232,7 @@ storageDriverShutdown(void) {
                 backend->stopPool(NULL, pool) < 0) {
                 virErrorPtr err = virGetLastError();
                 storageLog("Failed to stop storage pool '%s': %s",
-                           pool->def->name, err->message);
+                           pool->def->name, err ? err->message : NULL);
             }
             virStoragePoolObjClearVols(pool);
         }