Add null pointer check

Change-Id: I5f364e8010d61162ed57148658965b9730491050
1 file changed