Add one null check to tests am: f083b7741a
am: 83775e28f6

Change-Id: I93c7d0dd0cc2bf0c41824a090e1cf50375453acb