Improve error message for diverged deps