[IMP] Improve errors management