Improving exception handling.