I think the null object looks cleaner. But I'm happy to put the null check back in, it does seem a bit wasteful as the majority of annotations will have a null object.

Done.