fixed compiler problem with null annotation changes