KW Warning fixes

Adding fixes for null reference errors.

Change-Id: Ie62bd93860baef2670c164ae7a5d148440308213
CRs-Fixed: 2113171
1 file changed