Fix #2232. Add error handling for failed favorite changes