Null check

Change-Id: Iace51ac973908b5ac8b749b689d3fb360834fd60
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1