From 6ed3aedf79f5f12561b0dd6b3316f6442bbff2d1 Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal@gmail.com>
Date: Fri, 6 Nov 2015 00:48:08 +1100
Subject: [PATCH] * Merge vocab changes

---
 spacy/vocab.pyx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spacy/vocab.pyx b/spacy/vocab.pyx
index b78249973..3817e7127 100644
--- a/spacy/vocab.pyx
+++ b/spacy/vocab.pyx
@@ -135,7 +135,7 @@ cdef class Vocab:
         if lex != NULL:
             if lex.orth != self.strings[string]:
                 raise LookupError.mismatched_strings(
-                    lex.orth, self.strings[lex.orth], string)
+                    lex.orth, self.strings[string], self.strings[lex.orth], string)
             return lex
         else:
             return self._new_lexeme(mem, string)
@@ -443,7 +443,7 @@ class LookupError(Exception):
             "Query string: {query}\n"
             "Orth cached: {orth_str}\n"
             "ID of orth: {orth_id}".format(
-                query=original_string, orth_str=id_string, orth_id=id_)
+                query=repr(original_string), orth_str=repr(id_string), orth_id=id_)
         )