Fixed null check to ignore synthethic