push minor NPE guard/fix