fixed null pointer error

Change-Id: I027cc949e657f85e60282457d9051f7832909071