Added error handling to settings suggestions list am: 18bf581c77
am: 2cb851e5c9

Change-Id: I5f28a0c854597a576791be97fd1ab0c87183d65d