ErrorHandlingUtil upgrade