ack Takeshi for fixes to request error handling