Add one null check to tests
am: f083b7741a

Change-Id: Id2e678bfb216302ef93e593a210edefe5092772a