[java-sig-commits] [javapackages] Be defensive, watch out for None