diff --git a/hald/linux/addons/addon-hid-ups.c b/hald/linux/addons/addon-hid-ups.c
index 31f3803..d130bf7 100644
--- a/hald/linux/addons/addon-hid-ups.c
+++ b/hald/linux/addons/addon-hid-ups.c
@@ -400,7 +400,12 @@ main (int argc, char *argv[])
 
 			dbus_error_init (&error);
 			/* NOTE: commit_changeset won't do IPC if set is empty */
-			libhal_device_commit_changeset (ctx, cs, &error);
+			if (!libhal_device_commit_changeset (ctx, cs, &error)) {
+				if (dbus_error_is_set (&error)) {
+					HAL_INFO (("got error %s: %s", error.name, error.message));
+					dbus_error_free (&error);
+				}
+			}
 			libhal_device_free_changeset (cs);
 
 		}
diff --git a/libhal/libhal.c b/libhal/libhal.c
index e88ca3d..376807b 100644
--- a/libhal/libhal.c
+++ b/libhal/libhal.c
@@ -3949,6 +3949,8 @@ libhal_device_commit_changeset (LibHalCo
 		return FALSE;
 	}
 
+	dbus_message_unref (message);
+	dbus_message_unref (reply);
 	return TRUE;
 }
 
@@ -3984,6 +3986,7 @@ libhal_device_free_changeset (LibHalChan
 			fprintf (stderr, "%s %d : unknown change_type %d\n", __FILE__, __LINE__, elem->change_type);
 			break;
 		}
+		free (elem->key);
 		free (elem);
 	}