o Improve exception names and handling.