Revise dbus error handling codes to be more defensive