Better handling of request timeouts. The test fails, though.