dbus: Oops, abandon the correct container on error paths