Crash fix only. No functional change or testing. Change-Id: I0c6d114d024c29fc11ae61666f5938f11b01dd6a