Returning null instead

Change-Id: I2515a59e2ec5737b7a40cd916e8613db2569b622