Account for situation where residue annot!=null but extraannot==null
Authored by: dcaffrey 2007-09-29
Parent: [r1112]
Child: [r1114]