Better managing of errors