coverity#706286 uncaught exception

Change-Id: Ic951a16c3d44b36ce82f05381c98e13e74b8bc35
coverity#706287 uncaught exception

Change-Id: Ie2ec61c75d036dbad68bd43d5a2eb9834dadd735