Added null checks to avoid NPEs.

Bug: 25793157
Change-Id: I1fec5855e59e8ef1986d6d0125953ca199c6476f
2 files changed