Better error message for cherry pick tool