coverity#1158396 Uncaught exception

Change-Id: I0306b8431641d841027b30dfe1c03ecad5df6867