Merge pull request #1788 from apiraino/handle-no-pr-prefs

Merge pull request #1788 from apiraino/handle-no-pr-prefs #4867