Added error handling to settings suggestions list
am: 18bf581c77

Change-Id: Id946b2b75b9adc4c70fa4537da4ac509a6ab5c66