get rid of null string reference
Merge pull request #5 from gs2usr/cm-10.1

get rid of null string reference
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1