Address the issue early, get it documented, and resolve it amicably.