Fix score-keeping and move errors into RPC queue.