diff --git a/ChangeLog b/ChangeLog
index da496a6465..4a769fda86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  7 17:59:59 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/qemu_driver.c: don't print and extra OOM error on top of
+	  getpwuid error (Guido Günther)
+
 Mon Oct  6 15:47:00 EST 2008 Cole Robinson <crobinso@redhat.com>
 
 	* qemud/remote.c src/hash.c src/internal.h src/lxc_conf.c
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index b003b00a24..34d494fdcc 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -201,7 +201,7 @@ qemudStartup(void) {
         if (!(pw = getpwuid(uid))) {
             qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s\n"),
                      uid, strerror(errno));
-            goto out_of_memory;
+            goto out_nouid;
         }
 
         if (asprintf(&qemu_driver->logDir,
@@ -267,6 +267,7 @@ qemudStartup(void) {
  out_of_memory:
     qemudLog (QEMUD_ERR,
               "%s", _("qemudStartup: out of memory\n"));
+ out_nouid:
     VIR_FREE(base);
     VIR_FREE(qemu_driver);
     return -1;