Added error handling to settings suggestions list am: 2197e8d6f5
am: a6e6feffe6

Change-Id: Ia038629a47a212b2c4f5beb2eb367ffbfbbf6895