Fix build segfault

Change-Id: I2cf5504f62ba6328be8cdc2bb163068dd92e3164