Add exception handling for conflicts

No match.