FIX NPE in settings (fixes #921)