Merge "Prevent null point exception"
am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112