coverity#1158365 Uncaught exception

Change-Id: I821189c6baa6737dd3ff8cecd6c622e62d91d653