Added error handling to settings suggestions list
am: 2197e8d6f5

Change-Id: I93d2f5363f702dbec76f34f5e121d3d3c9e01ac5