Bug 987910 - Callers of updateFromMatchPairs() must handle error. r=nbp