Fix a NPE in the annotation mapping