fix NullPointException

PS1: Code Cleanup

Change-Id: I29039fe60097bf81e9a905f6a95a510f0ee5b515