coverity#1158406 Uncaught exception

Change-Id: I856ead663734cfa3c87c67eb461ff63160213349