FIX NPE in settings
Merge pull request #937 from dlsniper/fix-921

FIX NPE in settings (fixes #921)