[TASK] Cleanup error handling code and settings description