fixed null pointer error

Change-Id: Ib68b4796ddb0c91a34533bee089caf643cb23424