fix NullPointerException

Change-Id: I314fda53e67fa14ac68ee77bcf14585276194ed6
Merge "fix NullPointerException" into kk_mkt