cid#983607 unexpected std::exception

Change-Id: I0de931d79548505ca7d26ffdfb560cfd5c6105a9