null check for constructing Cadd annotator.
fix nullpointer in cadd annotator
removed commented code
Merge pull request #2259 from bartcharbon/master

null check for constructing Cadd annotator.