Add more null checks for page indicators.

Change-Id: Id86d4827c9079abfb236f956e531f0e29edfc54e
2 files changed