Fix errors management