Fix criteria error message, indicator