Add basic support for greedy error collection