One new exception; fix one FIXME in OFTCPSocket.