coverity#1224995 Uncaught exception

and

coverity#1224994 Uncaught exception

Change-Id: I7f25e3829dbd1e5d68561ca9853ab8fc10c79484