Further to the fix for #410, add a little more context to annotation-related exceptions