TRUNK-4495 Settings page returns 500

(cherry picked from commit cffe985c9dce9933a2978ecf137d5c2a8b17eed3)