coverity#737046 Uncaught exception

Change-Id: Icc089ca0b320c7db0e00b48a787e1657d65514ae
coverity#705773 Resource leak

Change-Id: I630fc03502b7bc510313656ae11ae1159f2319ae