Fix Settings and error handling