Fix more crash

Change-Id: Ib641c6b003545011b614d1b1347a3a1a657f651b