Fixed Settings error handling issue