better error management

better error management following feedback