Updates exception handling