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

Change-Id: I037f639918fb0a806023d23806d996ade193c0e4