Improving error management