Added todo for managing server errors - No functionality change