coverity#706611 Uncaught exception

Change-Id: I42bff46998b3d516161068af3d53bf92ee2f2b15
coverity#707336 Uncaught exception

and

coverity#707337 Uncaught exception

Change-Id: Id6ad65e382d2a5b5f8d13a312384d715b47e95db