CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences

-fixed