Gracefully handle Id/ID

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>