Fix NPE

Change-Id: I2adb98cd4c91af831e1ec9d9317b5148a1aa1e3b