Merge "Catch exception"
am: 123f338f14

Change-Id: If4e2c3425a2f504d6fc231901caff9b1d081d120