Improve errors management.