GPII-519: fixed a regression with preferences server payload in case of an error.
Merge remote-tracking branch 'yzen/GPII-519' into review2
Merge pull request #208 from kaspermarkus/review2

Review2