Improve exceptions names and handling.