Fix possible NPE

Fix null pointer error as reported on Jira
https://paranoidandroid.atlassian.net/browse/AOSPA-218

Change-Id: I7929a518b49ba25ac97f4e184a21da427d5aa70c
Merge "Fix possible NPE" into kitkat