Add null pointer checks to fix NPEs

Bug: 6611233
Bug: 6685401

Change-Id: I804dfe0a7ad36b43168f7384ef88459d765fff6b
2 files changed