Add error reporting heuristics