Added errors management functionality