Make reverse matching robust to errored courses