coverity#1224997 Uncaught exception

and

coverity#1224996 Uncaught exception

Change-Id: I36ea602a93471d826859bef739c4165117cc4cd9