Add more null checks for page indicators.
am: fea0a5f629

* commit 'fea0a5f629f7bc59117401b744ed334cf33a7ae0':
  Add more null checks for page indicators.

Change-Id: I3db6a16e0f0edf0891dbec3c91f1776a21ab9b70