Updated exception handling processing