I should check for NULL here.

Change-Id: I245f4a26c8fdee8230bb0af2963cae2739413253