Fix a different crash (Santhosh's) from LT-13878

Change-Id: Idadcafed0060dcdcef9fff7272450b9b1af08060