Fixed Problem with errors management