4335 pull from staging

we can use `classify_error` for this now, right?