Errors management better integration