Fixes #DGTF-929 by ensuring that the ID is set.