diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index e765e794..01bb0b54 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -540,8 +540,15 @@ _dbus_credentials_add_from_user (DBusCredentials         *credentials,
     {
       _DBUS_STATIC_ASSERT (sizeof (uid) == sizeof (dbus_uid_t));
 
-      _dbus_credentials_add_unix_uid (credentials, uid);
-      return TRUE;
+      if (_dbus_credentials_add_unix_uid (credentials, uid))
+        {
+          return TRUE;
+        }
+      else
+        {
+          _DBUS_SET_OOM (error);
+          return FALSE;
+        }
     }
 
   /* If we aren't allowed to look in NSS or /etc/passwd, fail now. */