Major correction for error management