Prevent NullPointerException and remove unsed variable

Bug: 234093736
Test: presubmit
Change-Id: Id4298f3af970cba0608960bcac21c141bb2d99aa
2 files changed