even better eb error handling