Improve exception handling, recovery