Improve exception behavior; cleanup.