Enhanced exception handling in recovery

Change-Id: I85ac05fc61a91650649c55113d10bef7966ae627
Merge "Enhanced exception handling in recovery"