tree ea3c9dc42d677ba54c56eec77bcdad5f0ff2f856
parent 4cbb22353a857c31bd3413da6ca8d3de0e2fe59f
author Mady Mellor <madym@google.com> 1586551205 -0700
committer Mady Mellor <madym@google.com> 1586551475 -0700

Fix preventable NPE & probable others

Test: treehugger
Bug: 153698788
Change-Id: I77bab3f8db7dc633784a2bbb03c57125726c1ffe