coverity#705042 Dereference after null check

Change-Id: Iac532477802588333560497767a613bb0a55effe
coverity#704830 Dereference after null check

Change-Id: Ifb9e226b848bfcba593bc54558680738158adc36