Fix #2332. Add error handling for failed favorite changes
Merge pull request #2334 from campbeb/fix2332

Fix #2332. Add error handling for failed favorite changes
Update PR for #2334