cheesy solution to prevent null explosion

Change-Id: Iff351a839c97fbeca8a5cfea19f0b96fad8daf72