Further exception handling system enhancement.