Improves error management