Feature/errors