More request & error handling work