Fix #2332. Add error handling for failed favorite changes