Gracefully handle situations in which id or uuid is unspecified.
Merge branch 'fix_annotation_handling' into inthe_am