Add correction for error handling