Fix #16 - Crash in SettingsActivity