coverity#441125 Dereference after null check

Change-Id: Ia8046dc20ff46612ad3ffeba098bee079858e8da
coverity#441136 Dereference after null check

Change-Id: I81a1a70094ae6b4ed685ae3fe88c645b160955bf
Revert "coverity#736486 try and make coverity see through this better"

This reverts commit a0bae848d42b675e4638420d632d710ed3cf76c3.